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

Side by Side Diff: content/shell/browser/shell_url_request_context_getter.cc

Issue 2067843003: Require a CTVerifier and CTPolicyEnforcer for TLS/QUIC sockets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixup Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/browser/shell_url_request_context_getter.h" 5 #include "content/shell/browser/shell_url_request_context_getter.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/string_split.h" 15 #include "base/strings/string_split.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/threading/sequenced_worker_pool.h" 17 #include "base/threading/sequenced_worker_pool.h"
18 #include "base/threading/worker_pool.h" 18 #include "base/threading/worker_pool.h"
19 #include "build/build_config.h" 19 #include "build/build_config.h"
20 #include "components/network_session_configurator/switches.h" 20 #include "components/network_session_configurator/switches.h"
21 #include "content/public/browser/browser_thread.h" 21 #include "content/public/browser/browser_thread.h"
22 #include "content/public/browser/cookie_store_factory.h" 22 #include "content/public/browser/cookie_store_factory.h"
23 #include "content/public/common/content_switches.h" 23 #include "content/public/common/content_switches.h"
24 #include "content/shell/browser/shell_network_delegate.h" 24 #include "content/shell/browser/shell_network_delegate.h"
25 #include "content/shell/common/shell_content_client.h" 25 #include "content/shell/common/shell_content_client.h"
26 #include "content/shell/common/shell_switches.h" 26 #include "content/shell/common/shell_switches.h"
27 #include "net/base/cache_type.h" 27 #include "net/base/cache_type.h"
28 #include "net/cert/cert_verifier.h" 28 #include "net/cert/cert_verifier.h"
29 #include "net/cert/ct_policy_enforcer.h"
30 #include "net/cert/multi_log_ct_verifier.h"
29 #include "net/cookies/cookie_monster.h" 31 #include "net/cookies/cookie_monster.h"
30 #include "net/dns/host_resolver.h" 32 #include "net/dns/host_resolver.h"
31 #include "net/dns/mapped_host_resolver.h" 33 #include "net/dns/mapped_host_resolver.h"
32 #include "net/http/http_auth_handler_factory.h" 34 #include "net/http/http_auth_handler_factory.h"
33 #include "net/http/http_cache.h" 35 #include "net/http/http_cache.h"
34 #include "net/http/http_network_session.h" 36 #include "net/http/http_network_session.h"
35 #include "net/http/http_server_properties_impl.h" 37 #include "net/http/http_server_properties_impl.h"
36 #include "net/http/transport_security_state.h" 38 #include "net/http/transport_security_state.h"
37 #include "net/proxy/proxy_service.h" 39 #include "net/proxy/proxy_service.h"
38 #include "net/ssl/channel_id_service.h" 40 #include "net/ssl/channel_id_service.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 storage_->set_http_user_agent_settings(base::WrapUnique( 134 storage_->set_http_user_agent_settings(base::WrapUnique(
133 new net::StaticHttpUserAgentSettings("en-us,en", GetShellUserAgent()))); 135 new net::StaticHttpUserAgentSettings("en-us,en", GetShellUserAgent())));
134 136
135 std::unique_ptr<net::HostResolver> host_resolver( 137 std::unique_ptr<net::HostResolver> host_resolver(
136 net::HostResolver::CreateDefaultResolver( 138 net::HostResolver::CreateDefaultResolver(
137 url_request_context_->net_log())); 139 url_request_context_->net_log()));
138 140
139 storage_->set_cert_verifier(net::CertVerifier::CreateDefault()); 141 storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
140 storage_->set_transport_security_state( 142 storage_->set_transport_security_state(
141 base::WrapUnique(new net::TransportSecurityState)); 143 base::WrapUnique(new net::TransportSecurityState));
144 storage_->set_cert_transparency_verifier(
145 base::WrapUnique(new net::MultiLogCTVerifier));
146 storage_->set_ct_policy_enforcer(
147 base::WrapUnique(new net::CTPolicyEnforcer));
142 storage_->set_proxy_service(GetProxyService()); 148 storage_->set_proxy_service(GetProxyService());
143 storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults); 149 storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
144 storage_->set_http_auth_handler_factory( 150 storage_->set_http_auth_handler_factory(
145 net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get())); 151 net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
146 storage_->set_http_server_properties( 152 storage_->set_http_server_properties(
147 base::WrapUnique(new net::HttpServerPropertiesImpl())); 153 base::WrapUnique(new net::HttpServerPropertiesImpl()));
148 154
149 base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache")); 155 base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
150 std::unique_ptr<net::HttpCache::DefaultBackend> main_backend( 156 std::unique_ptr<net::HttpCache::DefaultBackend> main_backend(
151 new net::HttpCache::DefaultBackend( 157 new net::HttpCache::DefaultBackend(
152 net::DISK_CACHE, 158 net::DISK_CACHE,
153 #if defined(OS_ANDROID) 159 #if defined(OS_ANDROID)
154 // TODO(rdsmith): Remove when default backend for Android is 160 // TODO(rdsmith): Remove when default backend for Android is
155 // changed to simple cache. 161 // changed to simple cache.
156 net::CACHE_BACKEND_SIMPLE, 162 net::CACHE_BACKEND_SIMPLE,
157 #else 163 #else
158 net::CACHE_BACKEND_DEFAULT, 164 net::CACHE_BACKEND_DEFAULT,
159 #endif 165 #endif
160 cache_path, 0, 166 cache_path, 0,
161 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE))); 167 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE)));
162 168
163 net::HttpNetworkSession::Params network_session_params; 169 net::HttpNetworkSession::Params network_session_params;
164 network_session_params.cert_verifier = 170 network_session_params.cert_verifier =
165 url_request_context_->cert_verifier(); 171 url_request_context_->cert_verifier();
166 network_session_params.transport_security_state = 172 network_session_params.transport_security_state =
167 url_request_context_->transport_security_state(); 173 url_request_context_->transport_security_state();
174 network_session_params.cert_transparency_verifier =
175 url_request_context_->cert_transparency_verifier();
176 network_session_params.ct_policy_enforcer =
177 url_request_context_->ct_policy_enforcer();
168 network_session_params.channel_id_service = 178 network_session_params.channel_id_service =
169 url_request_context_->channel_id_service(); 179 url_request_context_->channel_id_service();
170 network_session_params.proxy_service = 180 network_session_params.proxy_service =
171 url_request_context_->proxy_service(); 181 url_request_context_->proxy_service();
172 network_session_params.ssl_config_service = 182 network_session_params.ssl_config_service =
173 url_request_context_->ssl_config_service(); 183 url_request_context_->ssl_config_service();
174 network_session_params.http_auth_handler_factory = 184 network_session_params.http_auth_handler_factory =
175 url_request_context_->http_auth_handler_factory(); 185 url_request_context_->http_auth_handler_factory();
176 network_session_params.http_server_properties = 186 network_session_params.http_server_properties =
177 url_request_context_->http_server_properties(); 187 url_request_context_->http_server_properties();
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 scoped_refptr<base::SingleThreadTaskRunner> 258 scoped_refptr<base::SingleThreadTaskRunner>
249 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { 259 ShellURLRequestContextGetter::GetNetworkTaskRunner() const {
250 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); 260 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
251 } 261 }
252 262
253 net::HostResolver* ShellURLRequestContextGetter::host_resolver() { 263 net::HostResolver* ShellURLRequestContextGetter::host_resolver() {
254 return url_request_context_->host_resolver(); 264 return url_request_context_->host_resolver();
255 } 265 }
256 266
257 } // namespace content 267 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/pepper/ssl_context_helper.cc ('k') | extensions/browser/api/socket/socket_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698