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

Side by Side Diff: ios/web/shell/shell_url_request_context_getter.mm

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
« no previous file with comments | « ios/crnet/crnet_environment.mm ('k') | jingle/glue/proxy_resolving_client_socket.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ios/web/shell/shell_url_request_context_getter.h" 5 #include "ios/web/shell/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/base_paths.h" 10 #include "base/base_paths.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/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/threading/worker_pool.h" 15 #include "base/threading/worker_pool.h"
16 #include "ios/net/cookies/cookie_store_ios.h" 16 #include "ios/net/cookies/cookie_store_ios.h"
17 #include "ios/web/public/web_client.h" 17 #include "ios/web/public/web_client.h"
18 #include "ios/web/public/web_thread.h" 18 #include "ios/web/public/web_thread.h"
19 #include "ios/web/shell/shell_network_delegate.h" 19 #include "ios/web/shell/shell_network_delegate.h"
20 #include "net/base/cache_type.h" 20 #include "net/base/cache_type.h"
21 #include "net/cert/cert_verifier.h" 21 #include "net/cert/cert_verifier.h"
22 #include "net/cert/ct_policy_enforcer.h"
23 #include "net/cert/multi_log_ct_verifier.h"
22 #include "net/dns/host_resolver.h" 24 #include "net/dns/host_resolver.h"
23 #include "net/extras/sqlite/sqlite_persistent_cookie_store.h" 25 #include "net/extras/sqlite/sqlite_persistent_cookie_store.h"
24 #include "net/http/http_auth_handler_factory.h" 26 #include "net/http/http_auth_handler_factory.h"
25 #include "net/http/http_cache.h" 27 #include "net/http/http_cache.h"
26 #include "net/http/http_network_session.h" 28 #include "net/http/http_network_session.h"
27 #include "net/http/http_server_properties_impl.h" 29 #include "net/http/http_server_properties_impl.h"
28 #include "net/http/transport_security_persister.h" 30 #include "net/http/transport_security_persister.h"
29 #include "net/http/transport_security_state.h" 31 #include "net/http/transport_security_state.h"
30 #include "net/proxy/proxy_config_service_ios.h" 32 #include "net/proxy/proxy_config_service_ios.h"
31 #include "net/proxy/proxy_service.h" 33 #include "net/proxy/proxy_service.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 new net::StaticHttpUserAgentSettings("en-us,en", user_agent))); 94 new net::StaticHttpUserAgentSettings("en-us,en", user_agent)));
93 storage_->set_proxy_service( 95 storage_->set_proxy_service(
94 net::ProxyService::CreateUsingSystemProxyResolver( 96 net::ProxyService::CreateUsingSystemProxyResolver(
95 std::move(proxy_config_service_), 0, 97 std::move(proxy_config_service_), 0,
96 url_request_context_->net_log())); 98 url_request_context_->net_log()));
97 storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults); 99 storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
98 storage_->set_cert_verifier(net::CertVerifier::CreateDefault()); 100 storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
99 101
100 storage_->set_transport_security_state( 102 storage_->set_transport_security_state(
101 base::WrapUnique(new net::TransportSecurityState())); 103 base::WrapUnique(new net::TransportSecurityState()));
104 storage_->set_cert_transparency_verifier(
105 base::WrapUnique(new net::MultiLogCTVerifier));
106 storage_->set_ct_policy_enforcer(
107 base::WrapUnique(new net::CTPolicyEnforcer));
102 transport_security_persister_.reset(new net::TransportSecurityPersister( 108 transport_security_persister_.reset(new net::TransportSecurityPersister(
103 url_request_context_->transport_security_state(), base_path_, 109 url_request_context_->transport_security_state(), base_path_,
104 file_task_runner_, false)); 110 file_task_runner_, false));
105 storage_->set_channel_id_service(base::WrapUnique( 111 storage_->set_channel_id_service(base::WrapUnique(
106 new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr), 112 new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr),
107 base::WorkerPool::GetTaskRunner(true)))); 113 base::WorkerPool::GetTaskRunner(true))));
108 storage_->set_http_server_properties( 114 storage_->set_http_server_properties(
109 std::unique_ptr<net::HttpServerProperties>( 115 std::unique_ptr<net::HttpServerProperties>(
110 new net::HttpServerPropertiesImpl())); 116 new net::HttpServerPropertiesImpl()));
111 117
112 std::unique_ptr<net::HostResolver> host_resolver( 118 std::unique_ptr<net::HostResolver> host_resolver(
113 net::HostResolver::CreateDefaultResolver( 119 net::HostResolver::CreateDefaultResolver(
114 url_request_context_->net_log())); 120 url_request_context_->net_log()));
115 storage_->set_http_auth_handler_factory( 121 storage_->set_http_auth_handler_factory(
116 net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get())); 122 net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
117 storage_->set_host_resolver(std::move(host_resolver)); 123 storage_->set_host_resolver(std::move(host_resolver));
118 124
119 net::HttpNetworkSession::Params network_session_params; 125 net::HttpNetworkSession::Params network_session_params;
120 network_session_params.cert_verifier = 126 network_session_params.cert_verifier =
121 url_request_context_->cert_verifier(); 127 url_request_context_->cert_verifier();
122 network_session_params.transport_security_state = 128 network_session_params.transport_security_state =
123 url_request_context_->transport_security_state(); 129 url_request_context_->transport_security_state();
130 network_session_params.cert_transparency_verifier =
131 url_request_context_->cert_transparency_verifier();
132 network_session_params.ct_policy_enforcer =
133 url_request_context_->ct_policy_enforcer();
124 network_session_params.channel_id_service = 134 network_session_params.channel_id_service =
125 url_request_context_->channel_id_service(); 135 url_request_context_->channel_id_service();
126 network_session_params.net_log = url_request_context_->net_log(); 136 network_session_params.net_log = url_request_context_->net_log();
127 network_session_params.proxy_service = 137 network_session_params.proxy_service =
128 url_request_context_->proxy_service(); 138 url_request_context_->proxy_service();
129 network_session_params.ssl_config_service = 139 network_session_params.ssl_config_service =
130 url_request_context_->ssl_config_service(); 140 url_request_context_->ssl_config_service();
131 network_session_params.http_auth_handler_factory = 141 network_session_params.http_auth_handler_factory =
132 url_request_context_->http_auth_handler_factory(); 142 url_request_context_->http_auth_handler_factory();
133 network_session_params.http_server_properties = 143 network_session_params.http_server_properties =
(...skipping 24 matching lines...) Expand all
158 168
159 return url_request_context_.get(); 169 return url_request_context_.get();
160 } 170 }
161 171
162 scoped_refptr<base::SingleThreadTaskRunner> 172 scoped_refptr<base::SingleThreadTaskRunner>
163 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { 173 ShellURLRequestContextGetter::GetNetworkTaskRunner() const {
164 return network_task_runner_; 174 return network_task_runner_;
165 } 175 }
166 176
167 } // namespace web 177 } // namespace web
OLDNEW
« no previous file with comments | « ios/crnet/crnet_environment.mm ('k') | jingle/glue/proxy_resolving_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698