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

Side by Side Diff: net/url_request/url_request_context_builder.cc

Issue 2493863002: [Cronet] Ignore Certificate Transparency to avoid CT log expiration. (Closed)
Patch Set: Use IgnoresCTVerifier / PolicyEnforcer on iOS. Created 4 years, 1 month 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 (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
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 bool quic_enabled) { 248 bool quic_enabled) {
249 http_network_session_params_.enable_http2 = spdy_enabled; 249 http_network_session_params_.enable_http2 = spdy_enabled;
250 http_network_session_params_.enable_quic = quic_enabled; 250 http_network_session_params_.enable_quic = quic_enabled;
251 } 251 }
252 252
253 void URLRequestContextBuilder::set_ct_verifier( 253 void URLRequestContextBuilder::set_ct_verifier(
254 std::unique_ptr<CTVerifier> ct_verifier) { 254 std::unique_ptr<CTVerifier> ct_verifier) {
255 ct_verifier_ = std::move(ct_verifier); 255 ct_verifier_ = std::move(ct_verifier);
256 } 256 }
257 257
258 void URLRequestContextBuilder::set_ct_policy_enforcer(
259 std::unique_ptr<CTPolicyEnforcer> ct_policy_enforcer) {
260 ct_policy_enforcer_ = std::move(ct_policy_enforcer);
261 }
262
258 void URLRequestContextBuilder::SetCertVerifier( 263 void URLRequestContextBuilder::SetCertVerifier(
259 std::unique_ptr<CertVerifier> cert_verifier) { 264 std::unique_ptr<CertVerifier> cert_verifier) {
260 cert_verifier_ = std::move(cert_verifier); 265 cert_verifier_ = std::move(cert_verifier);
261 } 266 }
262 267
263 void URLRequestContextBuilder::SetInterceptors( 268 void URLRequestContextBuilder::SetInterceptors(
264 std::vector<std::unique_ptr<URLRequestInterceptor>> 269 std::vector<std::unique_ptr<URLRequestInterceptor>>
265 url_request_interceptors) { 270 url_request_interceptors) {
266 url_request_interceptors_ = std::move(url_request_interceptors); 271 url_request_interceptors_ = std::move(url_request_interceptors);
267 } 272 }
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 } 400 }
396 401
397 if (ct_verifier_) { 402 if (ct_verifier_) {
398 storage->set_cert_transparency_verifier(std::move(ct_verifier_)); 403 storage->set_cert_transparency_verifier(std::move(ct_verifier_));
399 } else { 404 } else {
400 std::unique_ptr<MultiLogCTVerifier> ct_verifier = 405 std::unique_ptr<MultiLogCTVerifier> ct_verifier =
401 base::MakeUnique<MultiLogCTVerifier>(); 406 base::MakeUnique<MultiLogCTVerifier>();
402 ct_verifier->AddLogs(ct::CreateLogVerifiersForKnownLogs()); 407 ct_verifier->AddLogs(ct::CreateLogVerifiersForKnownLogs());
403 storage->set_cert_transparency_verifier(std::move(ct_verifier)); 408 storage->set_cert_transparency_verifier(std::move(ct_verifier));
404 } 409 }
405 storage->set_ct_policy_enforcer(base::MakeUnique<CTPolicyEnforcer>()); 410 if (ct_policy_enforcer_) {
411 storage->set_ct_policy_enforcer(std::move(ct_policy_enforcer_));
412 } else {
413 storage->set_ct_policy_enforcer(base::MakeUnique<CTPolicyEnforcer>());
414 }
406 415
407 if (throttling_enabled_) { 416 if (throttling_enabled_) {
408 storage->set_throttler_manager( 417 storage->set_throttler_manager(
409 base::MakeUnique<URLRequestThrottlerManager>()); 418 base::MakeUnique<URLRequestThrottlerManager>());
410 } 419 }
411 420
412 HttpNetworkSession::Params network_session_params; 421 HttpNetworkSession::Params network_session_params;
413 SetHttpNetworkSessionComponents(context.get(), &network_session_params); 422 SetHttpNetworkSessionComponents(context.get(), &network_session_params);
414 423
415 network_session_params.ignore_certificate_errors = 424 network_session_params.ignore_certificate_errors =
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 } 531 }
523 url_request_interceptors_.clear(); 532 url_request_interceptors_.clear();
524 } 533 }
525 storage->set_job_factory(std::move(top_job_factory)); 534 storage->set_job_factory(std::move(top_job_factory));
526 // TODO(willchan): Support sdch. 535 // TODO(willchan): Support sdch.
527 536
528 return std::move(context); 537 return std::move(context);
529 } 538 }
530 539
531 } // namespace net 540 } // namespace net
OLDNEW
« components/cronet/ios/cronet_environment.cc ('K') | « net/url_request/url_request_context_builder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698