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

2009-05-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Added --xml-rpc-max-request-size option to limit the size of
	XML-RPC request.
pull/1/head
Tatsuhiro Tsujikawa 2009-05-26 14:38:11 +00:00
parent 4c1ed46094
commit 544732b124
6 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-05-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Added --xml-rpc-max-request-size option to limit the size of
XML-RPC request.
2009-05-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-05-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Documented XML-RPC API in man page. Documented XML-RPC API in man page.

9
src/HttpServerCommand.cc
View File

@ -45,6 +45,7 @@
#include "RecoverableException.h" #include "RecoverableException.h"
#include "prefs.h" #include "prefs.h"
#include "Option.h" #include "Option.h"
#include "Util.h"
namespace aria2 { namespace aria2 {
@ -103,6 +104,14 @@ bool HttpServerCommand::execute()
if(header.isNull()) { if(header.isNull()) {
_e->commands.push_back(this); _e->commands.push_back(this);
return false; return false;
} else if(static_cast<uint64_t>
(_e->option->getAsInt(PREF_XML_RPC_MAX_REQUEST_SIZE)) <
_httpServer->getContentLength()) {
logger->info("Request too long. ContentLength=%s."
" See --xml-rpc-max-request-size option to loose"
" this limitation.",
Util::uitos(_httpServer->getContentLength()).c_str());
return true;
} else { } else {
Command* command = new HttpServerBodyCommand(cuid, _httpServer, _e, Command* command = new HttpServerBodyCommand(cuid, _httpServer, _e,
_socket); _socket);

9
src/OptionHandlerFactory.cc
View File

@ -400,6 +400,15 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
op->addTag(TAG_ADVANCED); op->addTag(TAG_ADVANCED);
handlers.push_back(op); handlers.push_back(op);
} }
{
SharedHandle<OptionHandler> op(new UnitNumberOptionHandler
(PREF_XML_RPC_MAX_REQUEST_SIZE,
TEXT_XML_RPC_MAX_REQUEST_SIZE,
"2M",
0));
op->addTag(TAG_ADVANCED);
handlers.push_back(op);
}
{ {
SharedHandle<OptionHandler> op(new DefaultOptionHandler SharedHandle<OptionHandler> op(new DefaultOptionHandler
(PREF_XML_RPC_USER, (PREF_XML_RPC_USER,

2
src/prefs.cc
View File

@ -167,6 +167,8 @@ const std::string PREF_REUSE_URI("reuse-uri");
const std::string PREF_XML_RPC_USER("xml-rpc-user"); const std::string PREF_XML_RPC_USER("xml-rpc-user");
// value: string // value: string
const std::string PREF_XML_RPC_PASSWD("xml-rpc-passwd"); const std::string PREF_XML_RPC_PASSWD("xml-rpc-passwd");
// value: 1*digit
const std::string PREF_XML_RPC_MAX_REQUEST_SIZE("xml-rpc-max-request-size");
// value: string // value: string
const std::string PREF_ON_DOWNLOAD_START("on-download-start"); const std::string PREF_ON_DOWNLOAD_START("on-download-start");
const std::string PREF_ON_DOWNLOAD_STOP("on-download-stop"); const std::string PREF_ON_DOWNLOAD_STOP("on-download-stop");

2
src/prefs.h
View File

@ -171,6 +171,8 @@ extern const std::string PREF_REUSE_URI;
extern const std::string PREF_XML_RPC_USER; extern const std::string PREF_XML_RPC_USER;
// value: string // value: string
extern const std::string PREF_XML_RPC_PASSWD; extern const std::string PREF_XML_RPC_PASSWD;
// value: 1*digit
extern const std::string PREF_XML_RPC_MAX_REQUEST_SIZE;
// value: string // value: string
extern const std::string PREF_ON_DOWNLOAD_START; extern const std::string PREF_ON_DOWNLOAD_START;
extern const std::string PREF_ON_DOWNLOAD_STOP; extern const std::string PREF_ON_DOWNLOAD_STOP;

4
src/usage_text.h
View File

@ -491,6 +491,10 @@ _(" --enable-xml-rpc[=true|false] Enable XML-RPC server.\n"\
" It is strongly recommended to set username and\n"\ " It is strongly recommended to set username and\n"\
" password using --xml-rpc-user and --xml-rpc-passwd\n"\ " password using --xml-rpc-user and --xml-rpc-passwd\n"\
" option. See also --xml-rpc-listen-port option.") " option. See also --xml-rpc-listen-port option.")
#define TEXT_XML_RPC_MAX_REQUEST_SIZE \
_(" --xml-rpc-max-request-size=SIZE Set max size of XML-RPC request. If aria2\n"\
" detected the request is more than SIZE bytes, it\n"\
" drops connection.")
#define TEXT_XML_RPC_USER \ #define TEXT_XML_RPC_USER \
_(" --xml-rpc-user=USER Set XML-RPC user.") _(" --xml-rpc-user=USER Set XML-RPC user.")
#define TEXT_XML_RPC_PASSWD \ #define TEXT_XML_RPC_PASSWD \