Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(266)

Unified Diff: net/http/http_auth_handler_factory.cc

Issue 1414313002: Allow dynamic updating of authentication policies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add tests Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/http/http_auth_handler_factory.cc
diff --git a/net/http/http_auth_handler_factory.cc b/net/http/http_auth_handler_factory.cc
index 5a89964a80c6d47344e6ab2daa747a92b30b3305..07e35cea0ce73d0115f6bfb634d140d0371c4bcb 100644
--- a/net/http/http_auth_handler_factory.cc
+++ b/net/http/http_auth_handler_factory.cc
@@ -19,6 +19,11 @@
namespace net {
+static const char kBasic[] = "basic";
Bernhard Bauer 2015/10/23 08:15:41 Static isn't necessary here, as const variables au
aberent 2015/10/23 15:40:33 Done.
+static const char kDigest[] = "digest";
+static const char kNtlm[] = "ntlm";
+static const char kNegotiate[] = "negotiate";
+
int HttpAuthHandlerFactory::CreateAuthHandlerFromString(
const std::string& challenge,
HttpAuth::Target target,
@@ -48,10 +53,10 @@ HttpAuthHandlerFactory::CreateDefault(HostResolver* host_resolver) {
DCHECK(host_resolver);
scoped_ptr<HttpAuthHandlerRegistryFactory> registry_factory =
make_scoped_ptr(new HttpAuthHandlerRegistryFactory());
- registry_factory->RegisterSchemeFactory(
- "basic", new HttpAuthHandlerBasic::Factory());
- registry_factory->RegisterSchemeFactory(
- "digest", new HttpAuthHandlerDigest::Factory());
+ registry_factory->RegisterSchemeFactory(kBasic,
+ new HttpAuthHandlerBasic::Factory());
+ registry_factory->RegisterSchemeFactory(kDigest,
+ new HttpAuthHandlerDigest::Factory());
// On Android Chrome needs an account type configured to enable Kerberos,
// so the default factory should not include Kerberos.
@@ -64,7 +69,7 @@ HttpAuthHandlerFactory::CreateDefault(HostResolver* host_resolver) {
negotiate_factory->set_library(new SSPILibraryDefault());
#endif
negotiate_factory->set_host_resolver(host_resolver);
- registry_factory->RegisterSchemeFactory("negotiate", negotiate_factory);
+ registry_factory->RegisterSchemeFactory(kNegotiate, negotiate_factory);
#endif // defined(USE_KERBEROS) && !defined(OS_ANDROID)
HttpAuthHandlerNTLM::Factory* ntlm_factory =
@@ -72,7 +77,7 @@ HttpAuthHandlerFactory::CreateDefault(HostResolver* host_resolver) {
#if defined(OS_WIN)
ntlm_factory->set_sspi_library(new SSPILibraryDefault());
#endif
- registry_factory->RegisterSchemeFactory("ntlm", ntlm_factory);
+ registry_factory->RegisterSchemeFactory(kNtlm, ntlm_factory);
return registry_factory;
}
@@ -130,47 +135,36 @@ HttpAuthHandlerFactory* HttpAuthHandlerRegistryFactory::GetSchemeFactory(
// static
HttpAuthHandlerRegistryFactory* HttpAuthHandlerRegistryFactory::Create(
const std::vector<std::string>& supported_schemes,
- URLSecurityManager* security_manager,
HostResolver* host_resolver,
- const std::string& gssapi_library_name,
- const std::string& auth_android_negotiate_account_type,
- bool negotiate_disable_cname_lookup,
- bool negotiate_enable_port) {
+ const std::string& gssapi_library_name) {
HttpAuthHandlerRegistryFactory* registry_factory =
new HttpAuthHandlerRegistryFactory();
- if (IsSupportedScheme(supported_schemes, "basic"))
+ if (IsSupportedScheme(supported_schemes, kBasic))
registry_factory->RegisterSchemeFactory(
- "basic", new HttpAuthHandlerBasic::Factory());
- if (IsSupportedScheme(supported_schemes, "digest"))
+ kBasic, new HttpAuthHandlerBasic::Factory());
+ if (IsSupportedScheme(supported_schemes, kDigest))
registry_factory->RegisterSchemeFactory(
- "digest", new HttpAuthHandlerDigest::Factory());
- if (IsSupportedScheme(supported_schemes, "ntlm")) {
+ kDigest, new HttpAuthHandlerDigest::Factory());
+ if (IsSupportedScheme(supported_schemes, kNtlm)) {
HttpAuthHandlerNTLM::Factory* ntlm_factory =
new HttpAuthHandlerNTLM::Factory();
- ntlm_factory->set_url_security_manager(security_manager);
#if defined(OS_WIN)
ntlm_factory->set_sspi_library(new SSPILibraryDefault());
#endif
- registry_factory->RegisterSchemeFactory("ntlm", ntlm_factory);
+ registry_factory->RegisterSchemeFactory(kNtlm, ntlm_factory);
}
#if defined(USE_KERBEROS)
- if (IsSupportedScheme(supported_schemes, "negotiate")) {
+ if (IsSupportedScheme(supported_schemes, kNegotiate)) {
HttpAuthHandlerNegotiate::Factory* negotiate_factory =
new HttpAuthHandlerNegotiate::Factory();
-#if defined(OS_ANDROID)
- negotiate_factory->set_library(&auth_android_negotiate_account_type);
-#elif defined(OS_POSIX)
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
negotiate_factory->set_library(
new GSSAPISharedLibrary(gssapi_library_name));
#elif defined(OS_WIN)
negotiate_factory->set_library(new SSPILibraryDefault());
#endif
- negotiate_factory->set_url_security_manager(security_manager);
- DCHECK(host_resolver || negotiate_disable_cname_lookup);
negotiate_factory->set_host_resolver(host_resolver);
- negotiate_factory->set_disable_cname_lookup(negotiate_disable_cname_lookup);
- negotiate_factory->set_use_port(negotiate_enable_port);
- registry_factory->RegisterSchemeFactory("negotiate", negotiate_factory);
+ registry_factory->RegisterSchemeFactory(kNegotiate, negotiate_factory);
}
#endif // defined(USE_KERBEROS)
@@ -201,4 +195,40 @@ int HttpAuthHandlerRegistryFactory::CreateAuthHandler(
digest_nonce_count, net_log, handler);
}
+void HttpAuthHandlerRegistryFactory::SetSecurityManager(
+ URLSecurityManager* security_manager) {
+ HttpAuthHandlerFactory* ntlm_factory = GetSchemeFactory(kNtlm);
+ if (ntlm_factory)
+ ntlm_factory->set_url_security_manager(security_manager);
+ HttpAuthHandlerFactory* negotiate_factory = GetSchemeFactory(kNegotiate);
+ if (negotiate_factory)
+ negotiate_factory->set_url_security_manager(security_manager);
+}
+
+void HttpAuthHandlerRegistryFactory::SetAndroidAuthNegotiateAccountType(
+ const std::string& account_type) {
+#if defined(OS_ANDROID)
+ auto negotiate_factory = static_cast<HttpAuthHandlerNegotiate::Factory*>(
+ GetSchemeFactory(kNegotiate));
+ if (negotiate_factory)
+ negotiate_factory->set_library(&account_type);
+#endif
+}
+
+void HttpAuthHandlerRegistryFactory::SetNegotiateDisableCnameLookup(
+ bool negotiate_disable_cname_lookup) {
+ auto negotiate_factory = static_cast<HttpAuthHandlerNegotiate::Factory*>(
+ GetSchemeFactory(kNegotiate));
+ if (negotiate_factory)
+ negotiate_factory->set_disable_cname_lookup(negotiate_disable_cname_lookup);
+}
+
+void HttpAuthHandlerRegistryFactory::SetNegotiateEnablePort(
+ bool negotiate_enable_port) {
+ auto negotiate_factory = static_cast<HttpAuthHandlerNegotiate::Factory*>(
+ GetSchemeFactory(kNegotiate));
+ if (negotiate_factory)
+ negotiate_factory->set_use_port(negotiate_enable_port);
+}
+
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698