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

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: Feedback 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 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 new net::StaticHttpUserAgentSettings("en-us,en", user_agent))); 90 new net::StaticHttpUserAgentSettings("en-us,en", user_agent)));
89 storage_->set_proxy_service( 91 storage_->set_proxy_service(
90 net::ProxyService::CreateUsingSystemProxyResolver( 92 net::ProxyService::CreateUsingSystemProxyResolver(
91 std::move(proxy_config_service_), 0, 93 std::move(proxy_config_service_), 0,
92 url_request_context_->net_log())); 94 url_request_context_->net_log()));
93 storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults); 95 storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
94 storage_->set_cert_verifier(net::CertVerifier::CreateDefault()); 96 storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
95 97
96 storage_->set_transport_security_state( 98 storage_->set_transport_security_state(
97 base::WrapUnique(new net::TransportSecurityState())); 99 base::WrapUnique(new net::TransportSecurityState()));
100 storage_->set_cert_transparency_verifier(
101 base::WrapUnique(new net::MultiLogCTVerifier));
102 storage_->set_ct_policy_enforcer(
103 base::WrapUnique(new net::CTPolicyEnforcer));
98 transport_security_persister_.reset(new net::TransportSecurityPersister( 104 transport_security_persister_.reset(new net::TransportSecurityPersister(
99 url_request_context_->transport_security_state(), base_path_, 105 url_request_context_->transport_security_state(), base_path_,
100 file_task_runner_, false)); 106 file_task_runner_, false));
101 storage_->set_channel_id_service(base::WrapUnique( 107 storage_->set_channel_id_service(base::WrapUnique(
102 new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr), 108 new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr),
103 base::WorkerPool::GetTaskRunner(true)))); 109 base::WorkerPool::GetTaskRunner(true))));
104 storage_->set_http_server_properties( 110 storage_->set_http_server_properties(
105 std::unique_ptr<net::HttpServerProperties>( 111 std::unique_ptr<net::HttpServerProperties>(
106 new net::HttpServerPropertiesImpl())); 112 new net::HttpServerPropertiesImpl()));
107 113
108 std::unique_ptr<net::HostResolver> host_resolver( 114 std::unique_ptr<net::HostResolver> host_resolver(
109 net::HostResolver::CreateDefaultResolver( 115 net::HostResolver::CreateDefaultResolver(
110 url_request_context_->net_log())); 116 url_request_context_->net_log()));
111 storage_->set_http_auth_handler_factory( 117 storage_->set_http_auth_handler_factory(
112 net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get())); 118 net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
113 storage_->set_host_resolver(std::move(host_resolver)); 119 storage_->set_host_resolver(std::move(host_resolver));
114 120
115 net::HttpNetworkSession::Params network_session_params; 121 net::HttpNetworkSession::Params network_session_params;
116 network_session_params.cert_verifier = 122 network_session_params.cert_verifier =
117 url_request_context_->cert_verifier(); 123 url_request_context_->cert_verifier();
118 network_session_params.transport_security_state = 124 network_session_params.transport_security_state =
119 url_request_context_->transport_security_state(); 125 url_request_context_->transport_security_state();
126 network_session_params.cert_transparency_verifier =
127 url_request_context_->cert_transparency_verifier();
128 network_session_params.ct_policy_enforcer =
129 url_request_context_->ct_policy_enforcer();
120 network_session_params.channel_id_service = 130 network_session_params.channel_id_service =
121 url_request_context_->channel_id_service(); 131 url_request_context_->channel_id_service();
122 network_session_params.net_log = url_request_context_->net_log(); 132 network_session_params.net_log = url_request_context_->net_log();
123 network_session_params.proxy_service = 133 network_session_params.proxy_service =
124 url_request_context_->proxy_service(); 134 url_request_context_->proxy_service();
125 network_session_params.ssl_config_service = 135 network_session_params.ssl_config_service =
126 url_request_context_->ssl_config_service(); 136 url_request_context_->ssl_config_service();
127 network_session_params.http_auth_handler_factory = 137 network_session_params.http_auth_handler_factory =
128 url_request_context_->http_auth_handler_factory(); 138 url_request_context_->http_auth_handler_factory();
129 network_session_params.http_server_properties = 139 network_session_params.http_server_properties =
(...skipping 24 matching lines...) Expand all
154 164
155 return url_request_context_.get(); 165 return url_request_context_.get();
156 } 166 }
157 167
158 scoped_refptr<base::SingleThreadTaskRunner> 168 scoped_refptr<base::SingleThreadTaskRunner>
159 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { 169 ShellURLRequestContextGetter::GetNetworkTaskRunner() const {
160 return network_task_runner_; 170 return network_task_runner_;
161 } 171 }
162 172
163 } // namespace web 173 } // namespace web
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698