2009-01-31 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Send HTTP Authorization header only if it is requested by the
	server(response 401). There are some exceptions. The
	authorization header for proxy is always sent if it is available	
	without request	by the server.  If username/password is specified
	 in the URI, it is immediately sent to the server without
	request by the server.
	
	AbstractAuthResolver::_defaultAuthConfig is now initialized as
	SharedHandle<AuthConfig>().
	NetrcAuthResolver::resolveAuthConfig() returns
	SharedHandle<AuthConfig>() if no AuthConfig is available.
	* src/AbstractAuthResolver.cc
	* src/AbstractProxyRequestCommand.cc
	* src/AuthConfigFactory.cc
	* src/AuthConfigFactory.h
	* src/HttpConnection.cc
	* src/HttpRequest.cc
	* src/HttpRequest.h
	* src/HttpResponse.cc
	* src/HttpResponseCommand.cc
	* src/HttpSkipResponseCommand.cc
	* test/AuthConfigFactoryTest.cc
	* test/HttpRequestTest.cc
	* test/HttpResponseTest.cc
This commit is contained in:
Tatsuhiro Tsujikawa
2009-01-30 16:12:41 +00:00
parent 120ea4c609
commit e5c4b24454
14 changed files with 287 additions and 24 deletions

View File

@@ -38,6 +38,7 @@
#include "common.h"
#include <string>
#include <deque>
#include "SharedHandle.h"
#include "SingletonHolder.h"
@@ -62,7 +63,29 @@ private:
SharedHandle<AuthResolver> createHttpAuthResolver() const;
SharedHandle<AuthResolver> createFtpAuthResolver() const;
public:
class BasicCred {
public:
std::string _user;
std::string _password;
std::string _host;
std::string _path;
bool _activated;
BasicCred(const std::string& user, const std::string& password,
const std::string& host, const std::string& path,
bool activated = false);
void activate();
bool isActivated() const;
bool operator==(const BasicCred& cred) const;
bool operator<(const BasicCred& cred) const;
};
private:
std::deque<BasicCred> _basicCreds;
public:
AuthConfigFactory(const Option* option);
@@ -70,10 +93,25 @@ public:
~AuthConfigFactory();
SharedHandle<AuthConfig> createAuthConfig
(const SharedHandle<Request>& request) const;
(const SharedHandle<Request>& request);
void setNetrc(const SharedHandle<Netrc>& netrc);
// Find a BasicCred using findBasicCred() and activate it then
// return true. If matching BasicCred is not found, then return
// false.
bool activateBasicCred(const std::string& host, const std::string& path);
// Find a BasicCred using host and path and return the iterator
// pointing to it. If not found, then return _basicCreds.end().
std::deque<AuthConfigFactory::BasicCred>::iterator
findBasicCred(const std::string& host, const std::string& path);
// If the same BasicCred is already added, then it is replaced with
// given basicCred. Otherwise, insert given basicCred to
// _basicCreds.
void updateBasicCred(const BasicCred& basicCred);
static const std::string ANONYMOUS;
static const std::string ARIA2USER_AT;