enable NTLM settings auth-server-whitelist etc

rogerwang · rogerwang · commit 38e33ffb4193 · 2014-02-21T13:46:34.000+08:00
Fix nwjs#590 enables --auth-server-whitelist, --auth-schemes --gssapi-library-name, --auth-negotiate-delegate-whitelist
diff --git a/src/net/shell_url_request_context_getter.cc b/src/net/shell_url_request_context_getter.cc
@@ -42,6 +42,7 @@
 #include "net/ssl/server_bound_cert_service.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/cookies/cookie_monster.h"
+#include "net/http/http_auth_filter.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_session.h"
@@ -125,10 +126,20 @@ ShellURLRequestContextGetter::ShellURLRequestContextGetter(
     MessageLoop* io_loop,
     MessageLoop* file_loop,
     ProtocolHandlerMap* protocol_handlers,
-    ShellBrowserContext* browser_context)
+    ShellBrowserContext* browser_context,
+    const std::string& auth_schemes,
+    const std::string& auth_server_whitelist,
+    const std::string& auth_delegate_whitelist,
+    const std::string& gssapi_library_name)
     : ignore_certificate_errors_(ignore_certificate_errors),
       data_path_(data_path),
       root_path_(root_path),
+      auth_schemes_(auth_schemes),
+      negotiate_disable_cname_lookup_(false),
+      negotiate_enable_port_(false),
+      auth_server_whitelist_(auth_server_whitelist),
+      auth_delegate_whitelist_(auth_delegate_whitelist),
+      gssapi_library_name_(gssapi_library_name),
       io_loop_(io_loop),
       file_loop_(file_loop),
       browser_context_(browser_context) {
@@ -209,7 +220,8 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
 
     storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
     storage_->set_http_auth_handler_factory(
-        net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
+            CreateDefaultAuthHandlerFactory(host_resolver.get()));
+
     storage_->set_http_server_properties(
         scoped_ptr<net::HttpServerProperties>(
             new net::HttpServerPropertiesImpl()));
@@ -278,4 +290,31 @@ net::HostResolver* ShellURLRequestContextGetter::host_resolver() {
   return url_request_context_->host_resolver();
 }
 
+net::HttpAuthHandlerFactory* ShellURLRequestContextGetter::CreateDefaultAuthHandlerFactory(
+    net::HostResolver* resolver) {
+  net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL;
+  if (!auth_server_whitelist_.empty()) {
+    auth_filter_default_credentials =
+        new net::HttpAuthFilterWhitelist(auth_server_whitelist_);
+  }
+  net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL;
+  if (!auth_delegate_whitelist_.empty()) {
+    auth_filter_delegate =
+        new net::HttpAuthFilterWhitelist(auth_delegate_whitelist_);
+  }
+  url_security_manager_.reset(
+      net::URLSecurityManager::Create(auth_filter_default_credentials,
+                                      auth_filter_delegate));
+  std::vector<std::string> supported_schemes;
+  base::SplitString(auth_schemes_, ',', &supported_schemes);
+
+  scoped_ptr<net::HttpAuthHandlerRegistryFactory> registry_factory(
+      net::HttpAuthHandlerRegistryFactory::Create(
+          supported_schemes, url_security_manager_.get(),
+          resolver, gssapi_library_name_, negotiate_disable_cname_lookup_,
+          negotiate_enable_port_));
+
+  return registry_factory.release();
+}
+
 }  // namespace content
diff --git a/src/net/shell_url_request_context_getter.h b/src/net/shell_url_request_context_getter.h
@@ -31,10 +31,12 @@
 
 
 namespace net {
+class HttpAuthHandlerFactory;
 class HostResolver;
 class NetworkDelegate;
 class ProxyConfigService;
 class URLRequestContextStorage;
+class URLSecurityManager;
 }
 
 namespace base{
@@ -54,7 +56,11 @@ class ShellBrowserContext;
       base::MessageLoop* io_loop,
       base::MessageLoop* file_loop,
       ProtocolHandlerMap* protocol_handlers,
-      ShellBrowserContext*);
+      ShellBrowserContext*,
+      const std::string& auth_schemes,
+      const std::string& auth_server_whitelist,
+      const std::string& auth_delegate_whitelist,
+      const std::string& gssapi_library_name);
 
   // net::URLRequestContextGetter implementation.
   virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
@@ -65,18 +71,29 @@ class ShellBrowserContext;
 
  protected:
   virtual ~ShellURLRequestContextGetter();
+  net::HttpAuthHandlerFactory* CreateDefaultAuthHandlerFactory(net::HostResolver* resolver);
 
  private:
   bool ignore_certificate_errors_;
   base::FilePath data_path_;
   base::FilePath root_path_;
+
+  std::string auth_schemes_;
+  bool negotiate_disable_cname_lookup_;
+  bool negotiate_enable_port_;
+  std::string auth_server_whitelist_;
+  std::string auth_delegate_whitelist_;
+  std::string gssapi_library_name_;
+  // std::vector<GURL> spdyproxy_auth_origins_;
+
   base::MessageLoop* io_loop_;
   base::MessageLoop* file_loop_;
 
   scoped_ptr<net::ProxyConfigService> proxy_config_service_;
   scoped_ptr<net::NetworkDelegate> network_delegate_;
   scoped_ptr<net::URLRequestContextStorage> storage_;
   scoped_ptr<net::URLRequestContext> url_request_context_;
+  scoped_ptr<net::URLSecurityManager> url_security_manager_;
   ProtocolHandlerMap protocol_handlers_;
   ShellBrowserContext* browser_context_;
 
diff --git a/src/shell_browser_context.cc b/src/shell_browser_context.cc
@@ -25,6 +25,7 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/values.h"
+#include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/storage_partition.h"
@@ -155,13 +156,29 @@ net::URLRequestContextGetter* ShellBrowserContext::GetRequestContext()  {
 net::URLRequestContextGetter* ShellBrowserContext::CreateRequestContext(
     ProtocolHandlerMap* protocol_handlers) {
   DCHECK(!url_request_getter_);
+  CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  std::string auth_server_whitelist =
+    cmd_line->GetSwitchValueASCII(switches::kAuthServerWhitelist);
+  std::string auth_delegate_whitelist =
+    cmd_line->GetSwitchValueASCII(switches::kAuthNegotiateDelegateWhitelist);
+  std::string gssapi_library_name =
+    cmd_line->GetSwitchValueASCII(switches::kGSSAPILibraryName);
+  std::string auth_schemes =
+    cmd_line->GetSwitchValueASCII(switches::kAuthSchemes);
+
+  if (auth_schemes.empty())
+    auth_schemes = "digest,ntlm,negotiate";
+
   url_request_getter_ = new ShellURLRequestContextGetter(
       ignore_certificate_errors_,
       GetPath(),
       package_->path(),
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE),
-      protocol_handlers, this);
+      protocol_handlers, this,
+      auth_schemes, auth_server_whitelist, auth_delegate_whitelist,
+      gssapi_library_name);
+
   resource_context_->set_url_request_context_getter(url_request_getter_.get());
   return url_request_getter_.get();
 }
