From 14c4b1eabb38aed481711d2b399f8f77675a9011 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 28 Sep 2016 11:14:18 -0700 Subject: [PATCH 1/3] Set certificate transparency objects on URLRequestContextStorage --- brightray/browser/url_request_context_getter.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index 45daf0e4aebd..9349271b8aa3 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -277,10 +277,11 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { new net::HttpServerPropertiesImpl); storage_->set_http_server_properties(std::move(server_properties)); - cert_transparency_verifier_.reset(new net::MultiLogCTVerifier()); - cert_transparency_verifier_->AddLogs( - net::ct::CreateLogVerifiersForKnownLogs()); - ct_policy_enforcer_.reset(new net::CTPolicyEnforcer()); + std::unique_ptr ct_verifier = + base::MakeUnique(); + ct_verifier->AddLogs(net::ct::CreateLogVerifiersForKnownLogs()); + storage_->set_cert_transparency_verifier(std::move(ct_verifier)); + storage_->set_ct_policy_enforcer(base::MakeUnique()); net::HttpNetworkSession::Params network_session_params; network_session_params.cert_verifier = url_request_context_->cert_verifier(); @@ -296,8 +297,9 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { url_request_context_->http_auth_handler_factory(); network_session_params.net_log = url_request_context_->net_log(); network_session_params.cert_transparency_verifier = - cert_transparency_verifier_.get(); - network_session_params.ct_policy_enforcer = ct_policy_enforcer_.get(); + url_request_context_->cert_transparency_verifier(); + network_session_params.ct_policy_enforcer = + url_request_context_->ct_policy_enforcer(); // --disable-http2 if (command_line.HasSwitch(switches::kDisableHttp2)) { From 096d3e61fafe16aa5e84afadc4846ec6f12e750d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 28 Sep 2016 11:17:42 -0700 Subject: [PATCH 2/3] Remove unused instance variables --- brightray/browser/url_request_context_getter.cc | 1 + brightray/browser/url_request_context_getter.h | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index 9349271b8aa3..e375061a83c8 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -25,6 +25,7 @@ #include "net/cert/ct_known_logs.h" #include "net/cert/ct_log_verifier.h" #include "net/cert/ct_policy_enforcer.h" +#include "net/cert/multi_log_ct_verifier.h" #include "net/cookies/cookie_monster.h" #include "net/dns/mapped_host_resolver.h" #include "net/http/http_auth_filter.h" diff --git a/brightray/browser/url_request_context_getter.h b/brightray/browser/url_request_context_getter.h index 37c9abb06745..ed2814c738bd 100644 --- a/brightray/browser/url_request_context_getter.h +++ b/brightray/browser/url_request_context_getter.h @@ -8,7 +8,6 @@ #include "base/files/file_path.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/content_browser_client.h" -#include "net/cert/multi_log_ct_verifier.h" #include "net/http/http_cache.h" #include "net/http/url_security_manager.h" #include "net/url_request/url_request_context_getter.h" @@ -89,8 +88,6 @@ class URLRequestContextGetter : public net::URLRequestContextGetter { std::unique_ptr host_mapping_rules_; std::unique_ptr http_auth_preferences_; std::unique_ptr http_network_session_; - std::unique_ptr cert_transparency_verifier_; - std::unique_ptr ct_policy_enforcer_; content::ProtocolHandlerMap protocol_handlers_; content::URLRequestInterceptorScopedVector protocol_interceptors_; From c46200761f6bbee9418b19d5139e62c792fac552 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 28 Sep 2016 16:00:23 -0700 Subject: [PATCH 3/3] Use net::URLRequestContextBuilder::SetHttpNetworkSessionComponents helper --- .../browser/url_request_context_getter.cc | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index e375061a83c8..a5110a8f713c 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -46,6 +46,7 @@ #include "net/url_request/file_protocol_handler.h" #include "net/url_request/static_http_user_agent_settings.h" #include "net/url_request/url_request_context.h" +#include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_storage.h" #include "net/url_request/url_request_intercepting_job_factory.h" #include "net/url_request/url_request_job_factory_impl.h" @@ -285,22 +286,9 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { storage_->set_ct_policy_enforcer(base::MakeUnique()); net::HttpNetworkSession::Params network_session_params; - network_session_params.cert_verifier = url_request_context_->cert_verifier(); - network_session_params.proxy_service = url_request_context_->proxy_service(); - network_session_params.ssl_config_service = url_request_context_->ssl_config_service(); - network_session_params.http_server_properties = url_request_context_->http_server_properties(); + net::URLRequestContextBuilder::SetHttpNetworkSessionComponents( + url_request_context_.get(), &network_session_params); network_session_params.ignore_certificate_errors = false; - network_session_params.transport_security_state = - url_request_context_->transport_security_state(); - network_session_params.channel_id_service = - url_request_context_->channel_id_service(); - network_session_params.http_auth_handler_factory = - url_request_context_->http_auth_handler_factory(); - network_session_params.net_log = url_request_context_->net_log(); - network_session_params.cert_transparency_verifier = - url_request_context_->cert_transparency_verifier(); - network_session_params.ct_policy_enforcer = - url_request_context_->ct_policy_enforcer(); // --disable-http2 if (command_line.HasSwitch(switches::kDisableHttp2)) {