From 31ccca0778db85c159634478b4ec7997f6704860 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 11 Mar 2020 11:32:04 +0100 Subject: BASELINE: Update Chromium to 80.0.3987.136 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b Reviewed-by: Jüri Valdmann --- chromium/net/http/http_auth_controller.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'chromium/net/http/http_auth_controller.h') diff --git a/chromium/net/http/http_auth_controller.h b/chromium/net/http/http_auth_controller.h index 414554f4510..3a47c430589 100644 --- a/chromium/net/http/http_auth_controller.h +++ b/chromium/net/http/http_auth_controller.h @@ -14,6 +14,7 @@ #include "base/threading/thread_checker.h" #include "net/base/completion_once_callback.h" #include "net/base/net_export.h" +#include "net/base/network_isolation_key.h" #include "net/http/http_auth.h" #include "net/http/http_auth_preferences.h" #include "net/log/net_log_with_source.h" @@ -59,6 +60,10 @@ class NET_EXPORT_PRIVATE HttpAuthController // If |target| is PROXY, then |auth_url| should have no hierarchical // part since that is meaningless. // + // * |network_isolation_key| specifies the NetworkIsolationKey associated with + // the resource load. Depending on settings, credentials may be scoped + // to a single NetworkIsolationKey. + // // * |http_auth_cache| specifies the credentials cache to use. During // authentication if explicit (user-provided) credentials are used and // they can be cached to respond to authentication challenges in the @@ -78,13 +83,12 @@ class NET_EXPORT_PRIVATE HttpAuthController // // * |allow_default_credentials| is used for determining if the current // context allows ambient authentication using default credentials. - HttpAuthController( - HttpAuth::Target target, - const GURL& auth_url, - HttpAuthCache* http_auth_cache, - HttpAuthHandlerFactory* http_auth_handler_factory, - HostResolver* host_resolver, - HttpAuthPreferences::DefaultCredentials allow_default_credentials); + HttpAuthController(HttpAuth::Target target, + const GURL& auth_url, + const NetworkIsolationKey& network_isolation_key, + HttpAuthCache* http_auth_cache, + HttpAuthHandlerFactory* http_auth_handler_factory, + HostResolver* host_resolver); // Generate an authentication token for |target| if necessary. The return // value is a net error code. |OK| will be returned both in the case that @@ -197,6 +201,9 @@ class NET_EXPORT_PRIVATE HttpAuthController // For proxy authentication the path is empty. const std::string auth_path_; + // NetworkIsolationKey assocaied with the request. + const NetworkIsolationKey network_isolation_key_; + // |handler_| encapsulates the logic for the particular auth-scheme. // This includes the challenge's parameters. If nullptr, then there is no // associated auth handler. @@ -219,13 +226,6 @@ class NET_EXPORT_PRIVATE HttpAuthController // preventing an infinite auth restart loop. bool embedded_identity_used_; - // If the current context allows ambient authentication using default - // credentials. - // TODO(https://crbug.com/458508): Refactor |allow_default_credentials_| - // to be passed along with the other |HttpAuthPreferences|, rather then being - // passed directly to |HttpAuthController|. - HttpAuthPreferences::DefaultCredentials allow_default_credentials_; - // True if default credentials have already been tried for this transaction // in response to an HTTP authentication challenge. bool default_credentials_used_; -- cgit v1.2.1