diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-10-30 12:48:01 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-10-30 12:48:01 +0000 |
| commit | 6b7df851d3d4f237c17528310e46bd2ffb91ba8f (patch) | |
| tree | 600c87920f37dd1790df66c59ff3c11119d9405f /src/FtpConnection.cc | |
| parent | f3f8cc593c39e0b63958faf2c1271998c27f68f9 (diff) | |
2007-10-30 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Added ftp://USER:PASSWD@Servername automatic parsing.
* src/Request.{h, cc}: Removed AuthResolvers. Added _username
and
_password. Recognize username and password in URI.
* src/main.cc: Use AuthConfigFactory instead of RequestFactory.
* src/RequestGroup.cc: Use AuthConfigFactory instead of
RequestFactory.
* src/RequestFactory.{h, cc}: Removed.
* src/AuthConfigFactory.{h, cc}: New class.
* src/FtpConnection.cc: Use AuthConfigFactory.
* src/HttpRequest.cc: Use AuthConfigFactory.
* test/HttpRequestTest.cc: Updated.
* test/RequestTest.cc: Updated.
* test/AuthConfigFactoryTest.cc: New class.
* test/RequestFactoryTest.cc: Removed.
Diffstat (limited to 'src/FtpConnection.cc')
| -rw-r--r-- | src/FtpConnection.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/FtpConnection.cc b/src/FtpConnection.cc index f87d37b7..7a5cb419 100644 --- a/src/FtpConnection.cc +++ b/src/FtpConnection.cc @@ -37,6 +37,8 @@ #include "message.h" #include "prefs.h" #include "LogFactory.h" +#include "AuthConfigFactory.h" +#include "AuthConfig.h" FtpConnection::FtpConnection(int32_t cuid, const SocketHandle& socket, const RequestHandle req, const Option* op) @@ -49,7 +51,7 @@ FtpConnection::~FtpConnection() {} void FtpConnection::sendUser() const throw(DlRetryEx*) { - string request = "USER "+req->resolveFtpAuthConfig()->getUser()+"\r\n"; + string request = "USER "+AuthConfigFactorySingleton::instance()->createAuthConfig(req)->getUser()+"\r\n"; logger->info(MSG_SENDING_REQUEST, cuid, request.c_str()); socket->writeData(request); } @@ -57,7 +59,7 @@ void FtpConnection::sendUser() const void FtpConnection::sendPass() const throw(DlRetryEx*) { - string request = "PASS "+req->resolveFtpAuthConfig()->getPassword()+"\r\n"; + string request = "PASS "+AuthConfigFactorySingleton::instance()->createAuthConfig(req)->getPassword()+"\r\n"; logger->info(MSG_SENDING_REQUEST, cuid, "PASS ********"); socket->writeData(request); } |