github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't allow empty string for --rpc-secret option

pull/203/head
Tatsuhiro Tsujikawa 2014-02-19 21:46:06 +09:00
parent de4cd8b59b
commit 1a24020e63
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/OptionHandlerFactory.cc
View File

@ -875,11 +875,12 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers()
handlers.push_back(op); handlers.push_back(op);
} }
{ {
OptionHandler* op(new DefaultOptionHandler DefaultOptionHandler* op(new DefaultOptionHandler
(PREF_RPC_SECRET, (PREF_RPC_SECRET,
TEXT_RPC_SECRET)); TEXT_RPC_SECRET));
op->addTag(TAG_RPC); op->addTag(TAG_RPC);
op->setEraseAfterParse(true); op->setEraseAfterParse(true);
op->setAllowEmpty(false);
handlers.push_back(op); handlers.push_back(op);
} }
{ {

11
src/OptionHandlerImpl.cc
View File

@ -287,7 +287,8 @@ DefaultOptionHandler::DefaultOptionHandler
char shortName) char shortName)
: AbstractOptionHandler(pref, description, defaultValue, argType, : AbstractOptionHandler(pref, description, defaultValue, argType,
shortName), shortName),
possibleValuesString_(possibleValuesString) possibleValuesString_(possibleValuesString),
allowEmpty_(true)
{} {}
DefaultOptionHandler::~DefaultOptionHandler() {} DefaultOptionHandler::~DefaultOptionHandler() {}
@ -295,6 +296,9 @@ DefaultOptionHandler::~DefaultOptionHandler() {}
void DefaultOptionHandler::parseArg(Option& option, const std::string& optarg) void DefaultOptionHandler::parseArg(Option& option, const std::string& optarg)
const const
{ {
if(!allowEmpty_ && optarg.empty()) {
throw DL_ABORT_EX("Empty string is not allowed");
}
option.put(pref_, optarg); option.put(pref_, optarg);
} }
@ -303,6 +307,11 @@ std::string DefaultOptionHandler::createPossibleValuesString() const
return possibleValuesString_; return possibleValuesString_;
} }
void DefaultOptionHandler::setAllowEmpty(bool allow)
{
allowEmpty_ = allow;
}
CumulativeOptionHandler::CumulativeOptionHandler CumulativeOptionHandler::CumulativeOptionHandler
(PrefPtr pref, (PrefPtr pref,
const char* description, const char* description,

2
src/OptionHandlerImpl.h
View File

@ -127,6 +127,7 @@ public:
class DefaultOptionHandler : public AbstractOptionHandler { class DefaultOptionHandler : public AbstractOptionHandler {
private: private:
std::string possibleValuesString_; std::string possibleValuesString_;
bool allowEmpty_;
public: public:
DefaultOptionHandler(PrefPtr pref, DefaultOptionHandler(PrefPtr pref,
const char* description = NO_DESCRIPTION, const char* description = NO_DESCRIPTION,
@ -138,6 +139,7 @@ public:
virtual void parseArg(Option& option, const std::string& optarg) const virtual void parseArg(Option& option, const std::string& optarg) const
CXX11_OVERRIDE; CXX11_OVERRIDE;
virtual std::string createPossibleValuesString() const CXX11_OVERRIDE; virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
void setAllowEmpty(bool allow);
}; };
class CumulativeOptionHandler : public AbstractOptionHandler { class CumulativeOptionHandler : public AbstractOptionHandler {