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

Side by Side Diff: net/url_request/url_request_context_builder.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
« no previous file with comments | « net/url_request/url_request_context.cc ('k') | net/url_request/url_request_context_storage.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/url_request/url_request_context_builder.h" 5 #include "net/url_request/url_request_context_builder.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
15 #include "base/single_thread_task_runner.h" 15 #include "base/single_thread_task_runner.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/threading/thread.h" 17 #include "base/threading/thread.h"
18 #include "base/threading/thread_task_runner_handle.h" 18 #include "base/threading/thread_task_runner_handle.h"
19 #include "net/base/cache_type.h" 19 #include "net/base/cache_type.h"
20 #include "net/base/net_errors.h" 20 #include "net/base/net_errors.h"
21 #include "net/base/network_delegate_impl.h" 21 #include "net/base/network_delegate_impl.h"
22 #include "net/base/sdch_manager.h" 22 #include "net/base/sdch_manager.h"
23 #include "net/cert/cert_verifier.h" 23 #include "net/cert/cert_verifier.h"
24 #include "net/cert/ct_policy_enforcer.h"
25 #include "net/cert/multi_log_ct_verifier.h"
24 #include "net/cookies/cookie_monster.h" 26 #include "net/cookies/cookie_monster.h"
25 #include "net/dns/host_resolver.h" 27 #include "net/dns/host_resolver.h"
26 #include "net/http/http_auth_handler_factory.h" 28 #include "net/http/http_auth_handler_factory.h"
27 #include "net/http/http_cache.h" 29 #include "net/http/http_cache.h"
28 #include "net/http/http_network_layer.h" 30 #include "net/http/http_network_layer.h"
29 #include "net/http/http_server_properties_impl.h" 31 #include "net/http/http_server_properties_impl.h"
30 #include "net/http/http_server_properties_manager.h" 32 #include "net/http/http_server_properties_manager.h"
31 #include "net/http/transport_security_persister.h" 33 #include "net/http/transport_security_persister.h"
32 #include "net/http/transport_security_state.h" 34 #include "net/http/transport_security_state.h"
33 #include "net/quic/quic_stream_factory.h" 35 #include "net/quic/quic_stream_factory.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 218
217 URLRequestContextBuilder::~URLRequestContextBuilder() {} 219 URLRequestContextBuilder::~URLRequestContextBuilder() {}
218 220
219 void URLRequestContextBuilder::SetHttpNetworkSessionComponents( 221 void URLRequestContextBuilder::SetHttpNetworkSessionComponents(
220 const URLRequestContext* context, 222 const URLRequestContext* context,
221 HttpNetworkSession::Params* params) { 223 HttpNetworkSession::Params* params) {
222 params->host_resolver = context->host_resolver(); 224 params->host_resolver = context->host_resolver();
223 params->cert_verifier = context->cert_verifier(); 225 params->cert_verifier = context->cert_verifier();
224 params->transport_security_state = context->transport_security_state(); 226 params->transport_security_state = context->transport_security_state();
225 params->cert_transparency_verifier = context->cert_transparency_verifier(); 227 params->cert_transparency_verifier = context->cert_transparency_verifier();
228 params->ct_policy_enforcer = context->ct_policy_enforcer();
226 params->proxy_service = context->proxy_service(); 229 params->proxy_service = context->proxy_service();
227 params->ssl_config_service = context->ssl_config_service(); 230 params->ssl_config_service = context->ssl_config_service();
228 params->http_auth_handler_factory = context->http_auth_handler_factory(); 231 params->http_auth_handler_factory = context->http_auth_handler_factory();
229 params->http_server_properties = context->http_server_properties(); 232 params->http_server_properties = context->http_server_properties();
230 params->net_log = context->net_log(); 233 params->net_log = context->net_log();
231 params->channel_id_service = context->channel_id_service(); 234 params->channel_id_service = context->channel_id_service();
232 } 235 }
233 236
234 void URLRequestContextBuilder::EnableHttpCache(const HttpCacheParams& params) { 237 void URLRequestContextBuilder::EnableHttpCache(const HttpCacheParams& params) {
235 http_cache_enabled_ = true; 238 http_cache_enabled_ = true;
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 storage->set_http_server_properties( 382 storage->set_http_server_properties(
380 std::unique_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); 383 std::unique_ptr<HttpServerProperties>(new HttpServerPropertiesImpl()));
381 } 384 }
382 385
383 if (cert_verifier_) { 386 if (cert_verifier_) {
384 storage->set_cert_verifier(std::move(cert_verifier_)); 387 storage->set_cert_verifier(std::move(cert_verifier_));
385 } else { 388 } else {
386 storage->set_cert_verifier(CertVerifier::CreateDefault()); 389 storage->set_cert_verifier(CertVerifier::CreateDefault());
387 } 390 }
388 391
392 storage->set_cert_transparency_verifier(
393 base::MakeUnique<MultiLogCTVerifier>());
394 storage->set_ct_policy_enforcer(base::MakeUnique<CTPolicyEnforcer>());
395
389 if (throttling_enabled_) { 396 if (throttling_enabled_) {
390 storage->set_throttler_manager( 397 storage->set_throttler_manager(
391 base::WrapUnique(new URLRequestThrottlerManager())); 398 base::WrapUnique(new URLRequestThrottlerManager()));
392 } 399 }
393 400
394 if (backoff_enabled_) { 401 if (backoff_enabled_) {
395 storage->set_backoff_manager( 402 storage->set_backoff_manager(
396 base::WrapUnique(new URLRequestBackoffManager())); 403 base::WrapUnique(new URLRequestBackoffManager()));
397 } 404 }
398 405
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 } 522 }
516 url_request_interceptors_.clear(); 523 url_request_interceptors_.clear();
517 } 524 }
518 storage->set_job_factory(std::move(top_job_factory)); 525 storage->set_job_factory(std::move(top_job_factory));
519 // TODO(willchan): Support sdch. 526 // TODO(willchan): Support sdch.
520 527
521 return std::move(context); 528 return std::move(context);
522 } 529 }
523 530
524 } // namespace net 531 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_context.cc ('k') | net/url_request/url_request_context_storage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698