diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-03-18 15:42:34 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-03-18 15:42:34 +0000 |
| commit | 7ff627079f6ed776dea1ce6fede1c1a07ef7f288 (patch) | |
| tree | 8f7b7e5b763dc3841df03928fe2aa50abd35a810 /test/HttpRequestTest.cc | |
| parent | 58d4dde223e815b75a3bf6bfbd4169818faca3bd (diff) | |
2007-03-19 Tatsuhiro Tsujikawa <tujikawa at valkyrie dot rednoah com>
To integrate Netrc into exsiting classes:
* src/Request.h
(_userDefinedAuthConfig): New variable.
(findNetrcAuthenticator): New function.
(segment): Removed.
(setUserDefinedAuthConfig): New function.
(resolveHttpAuthConfigItem): New function.
(resolveFtpAuthConfigItem): New function.
(resolveHttpProxyAuthConfigItem): New function.
* src/HttpRequest.h
(authConfig): Removed.
(proxyAuthConfig): Removed.
(setAuthConfig): Removed.
(setProxyAuthConfig): Removed.
* src/UrlRequest.h
(getHeadResult): Added a parameter: authConfigHandle
* src/common.h
(SingletonHolder.h): New include.
* src/main.cc
(Netrc.h): New include.
(main): Removed initial values of PREF_FTP_USER,
PREF_FTP_PASSWD.
Added initial value of PREF_NETRC_PATH.
Added the initialization of netrc.
* src/AuthConfig.h: New class.
* src/prefs.h
(PREF_NETRC_PATH): New definition.
* src/HttpAuthConfig.h: Removed.
* src/Netrc.cc
(getRequiredNextToken): New function.
(skipMacdef): New function.
(parse): Rewritten.
* src/Netrc.h
(getRequiredNextToken): New function.
(skipMacdef): New function.
* src/Util.h, src/Util.cc
(getHomeDir): New function.
* src/TrackerWatcherComand.cc
(createRequestCommand): Use AuthConfig.
* src/FtpConnection.cc
(sendUser): Use Request::resolveFtpAuthConfigItem().
(sendPass): Use Request::resolveFtpAuthConfigItem().
* src/Request.cc
(findNetrcAuthenticator): New function.
(resolveHttpAuthConfigItem): New function.
(resolveFtpAuthConfigItem): New function.
(resolveHttpProxyAuthConfigItem): New function.
* src/UrlRequestInfo.cc: Use AuthConfig.
* src/HttpRequest.cc
(createRequest): Use authConfig.
(getProxyAuthString): Use authConfig.
(configure): Removed PREF_HTTP_USER, PREF_HTTP_PASSWD,
PREF_HTTP_PROXY_USER, PREF_HTTP_PROXY_PASSWD.
Diffstat (limited to 'test/HttpRequestTest.cc')
| -rw-r--r-- | test/HttpRequestTest.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/HttpRequestTest.cc b/test/HttpRequestTest.cc index a777a0ea..671d1628 100644 --- a/test/HttpRequestTest.cc +++ b/test/HttpRequestTest.cc @@ -81,6 +81,9 @@ void HttpRequestTest::testCreateRequest() { RequestHandle request = new Request(); request->setUrl("http://localhost:8080/archives/aria2-1.0.0.tar.bz2"); + AuthConfigHandle authConfig = new AuthConfig(); + request->setUserDefinedAuthConfig(authConfig); + SegmentHandle segment = new Segment(); HttpRequest httpRequest; @@ -168,6 +171,7 @@ void HttpRequestTest::testCreateRequest() option->put(PREF_HTTP_PROXY_USER, "aria2proxyuser"); option->put(PREF_HTTP_PROXY_PASSWD, "aria2proxypasswd"); + authConfig->configure(option.get()); httpRequest.configure(option.get()); expectedText = "GET /archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n" @@ -278,6 +282,8 @@ void HttpRequestTest::testCreateRequest_ftp() { RequestHandle request = new Request(); request->setUrl("ftp://localhost:8080/archives/aria2-1.0.0.tar.bz2"); + AuthConfigHandle authConfig = new AuthConfig(); + request->setUserDefinedAuthConfig(authConfig); SegmentHandle segment = new Segment(); HttpRequest httpRequest; @@ -296,6 +302,7 @@ void HttpRequestTest::testCreateRequest_ftp() option->put(PREF_HTTP_PROXY_PASSWD, "aria2proxypasswd"); httpRequest.configure(option.get()); + authConfig->configure(option.get()); string expectedText = "GET ftp://localhost:8080/archives/aria2-1.0.0.tar.bz2 HTTP/1.1\r\n" "User-Agent: aria2\r\n" |