Download-Tools/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-01-04 09:03:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2010-07-09 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Browse Source 
Fixed the bug that aria2 cannot handle %2F in FTP URI properly.
	If directory component starts with %2F which percent-encode of
	'/', client should issue CWD to absolute path, but aria2 does not
	do that. It just issues relative path and download fails.
	* src/FtpConnection.cc
	* test/FtpConnectionTest.cc
This commit is contained in:
Tatsuhiro Tsujikawa 2010-07-08 16:40:21 +00:00
parent 880af94348
commit 52a6ea008e
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2010-07-09 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Fixed the bug that aria2 cannot handle %2F in FTP URI properly.
If directory component starts with %2F which percent-encode of
'/', client should issue CWD to absolute path, but aria2 does not
do that. It just issues relative path and download fails.
* src/FtpConnection.cc
* test/FtpConnectionTest.cc
2010-07-09 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Increased DOMAIN_EVICTION_TRIGGER to 2000

10
src/FtpConnection.cc
View File

@ -150,10 +150,14 @@ bool FtpConnection::sendCwd()
util::itos(cuid_).c_str(), baseWorkingDir_.c_str());
}
std::string request = "CWD ";
if(baseWorkingDir_ != "/") {
request += baseWorkingDir_;
if(util::startsWith(util::toUpper(req_->getDir()), "/%2F")) {
request += util::percentDecode(req_->getDir().substr(1));
} else {
if(baseWorkingDir_ != "/") {
request += baseWorkingDir_;
}
request += util::percentDecode(req_->getDir());
}
request += util::percentDecode(req_->getDir());
request += "\r\n";
if(logger_->info()) {
logger_->info(MSG_SENDING_REQUEST,

23
test/FtpConnectionTest.cc
View File

@ -30,6 +30,7 @@ class FtpConnectionTest:public CppUnit::TestFixture {
CPPUNIT_TEST(testReceivePwdResponse_badStatus);
CPPUNIT_TEST(testSendCwd);
CPPUNIT_TEST(testSendCwd_baseWorkingDir);
CPPUNIT_TEST(testSendCwd_absDir);
CPPUNIT_TEST(testSendSize);
CPPUNIT_TEST(testReceiveSizeResponse);
CPPUNIT_TEST(testSendRetr);
@ -41,6 +42,7 @@ private:
SharedHandle<FtpConnection> ftp_;
SharedHandle<Option> option_;
SharedHandle<AuthConfigFactory> authConfigFactory_;
SharedHandle<Request> req_;
public:
void setUp()
{
@ -55,8 +57,8 @@ public:
listenSocket->getAddrInfo(addrinfo);
listenPort_ = addrinfo.second;
SharedHandle<Request> req(new Request());
req->setUri("ftp://localhost/dir%20sp/hello%20world.img");
req_.reset(new Request());
req_->setUri("ftp://localhost/dir%20sp/hello%20world.img");
clientSocket_.reset(new SocketCore());
clientSocket_->establishConnection("localhost", listenPort_);
@ -65,9 +67,9 @@ public:
clientSocket_->setBlockingMode();
serverSocket_.reset(listenSocket->acceptConnection());
ftp_.reset(new FtpConnection(1, clientSocket_, req,
ftp_.reset(new FtpConnection(1, clientSocket_, req_,
authConfigFactory_->createAuthConfig
(req, option_.get()),
(req_, option_.get()),
option_.get()));
}
@ -83,6 +85,7 @@ public:
void testReceivePwdResponse_badStatus();
void testSendCwd();
void testSendCwd_baseWorkingDir();
void testSendCwd_absDir();
void testSendSize();
void testReceiveSizeResponse();
void testSendRetr();
@ -282,6 +285,18 @@ void FtpConnectionTest::testSendCwd_baseWorkingDir()
CPPUNIT_ASSERT_EQUAL(std::string("CWD /base/dir sp\r\n"), std::string(data));
}
void FtpConnectionTest::testSendCwd_absDir()
{
req_->setUri("http://localhost/%2fdir/file");
ftp_->setBaseWorkingDir("/base");
ftp_->sendCwd();
char data[32];
size_t len = sizeof(data);
serverSocket_->readData(data, len);
data[len] = '\0';
CPPUNIT_ASSERT_EQUAL(std::string("CWD /dir\r\n"), std::string(data));
}
void FtpConnectionTest::testSendSize()
{
ftp_->sendSize();