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.

1 files changed, 6 insertions, 21 deletions

diff --git a/src/Request.h b/src/Request.h
index 73fdd833..3dc26c35 100644
--- a/src/Request.h
+++ b/src/Request.h
@@ -36,8 +36,6 @@
 #define _D_REQUEST_H_
 #include "common.h"
 #include "CookieBox.h"
-#include "AuthConfig.h"
-#include "AuthResolver.h"
 
 #define SAFE_CHARS "abcdefghijklmnopqrstuvwxyz"\
 "ABCDEFGHIJKLMNOPQRSTUVWXYZ"\
@@ -80,11 +78,9 @@ private:
   bool keepAlive;
   string method;
 
-  AuthResolverHandle _httpAuthResolver;
+  string _username;
 
-  AuthResolverHandle _httpProxyAuthResolver;
-
-  AuthResolverHandle _ftpAuthResolver;
+  string _password;
 
   bool parseUrl(const string& url);
 public:
@@ -125,27 +121,16 @@ public:
     this->method = method;
   }
 
-  void setHttpAuthResolver(const AuthResolverHandle& authResolver)
-  {
-    _httpAuthResolver = authResolver;
-  }
-
-  void setHttpProxyAuthResolver(const AuthResolverHandle& authResolver)
+  const string& getUsername() const
   {
-    _httpProxyAuthResolver = authResolver;
+    return _username;
   }
 
-  void setFtpAuthResolver(const AuthResolverHandle& authResolver)
+  const string& getPassword() const
   {
-    _ftpAuthResolver = authResolver;
+    return _password;
   }
 
-  AuthConfigHandle resolveHttpAuthConfig();
-
-  AuthConfigHandle resolveFtpAuthConfig();
-
-  AuthConfigHandle resolveHttpProxyAuthConfig();
-
   const string& getMethod() const {
     return method;
   }