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

Side by Side Diff: components/cronet/url_request_context_config.cc

Issue 1898873006: Cronet: Use stale DNS cache entries experimentally. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dns_stale2
Patch Set: Make requested changes. Created 4 years, 4 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 "components/cronet/url_request_context_config.h" 5 #include "components/cronet/url_request_context_config.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/sequenced_task_runner.h" 12 #include "base/sequenced_task_runner.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/string_piece.h" 14 #include "base/strings/string_piece.h"
15 #include "base/strings/string_split.h" 15 #include "base/strings/string_split.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "components/cronet/stale_host_resolver.h"
17 #include "net/cert/caching_cert_verifier.h" 18 #include "net/cert/caching_cert_verifier.h"
18 #include "net/cert/cert_verifier.h" 19 #include "net/cert/cert_verifier.h"
19 #include "net/cert/cert_verify_proc.h" 20 #include "net/cert/cert_verify_proc.h"
20 #include "net/cert/multi_threaded_cert_verifier.h" 21 #include "net/cert/multi_threaded_cert_verifier.h"
21 #include "net/dns/host_resolver.h" 22 #include "net/dns/host_resolver.h"
22 #include "net/http/http_server_properties.h" 23 #include "net/http/http_server_properties.h"
23 #include "net/quic/core/quic_protocol.h" 24 #include "net/quic/core/quic_protocol.h"
24 #include "net/quic/core/quic_utils.h" 25 #include "net/quic/core/quic_utils.h"
25 #include "net/socket/ssl_client_socket.h" 26 #include "net/socket/ssl_client_socket.h"
26 #include "net/url_request/url_request_context_builder.h" 27 #include "net/url_request/url_request_context_builder.h"
(...skipping 26 matching lines...) Expand all
53 const char kQuicMigrateSessionsEarly[] = "migrate_sessions_early"; 54 const char kQuicMigrateSessionsEarly[] = "migrate_sessions_early";
54 const char kQuicDisableBidirectionalStreams[] = 55 const char kQuicDisableBidirectionalStreams[] =
55 "quic_disable_bidirectional_streams"; 56 "quic_disable_bidirectional_streams";
56 const char kQuicRaceCertVerification[] = "race_cert_verification"; 57 const char kQuicRaceCertVerification[] = "race_cert_verification";
57 58
58 // AsyncDNS experiment dictionary name. 59 // AsyncDNS experiment dictionary name.
59 const char kAsyncDnsFieldTrialName[] = "AsyncDNS"; 60 const char kAsyncDnsFieldTrialName[] = "AsyncDNS";
60 // Name of boolean to enable AsyncDNS experiment. 61 // Name of boolean to enable AsyncDNS experiment.
61 const char kAsyncDnsEnable[] = "enable"; 62 const char kAsyncDnsEnable[] = "enable";
62 63
64 // Stale DNS (StaleHostResolver) experiment dictionary name.
65 const char kStaleDnsFieldTrialName[] = "StaleDNS";
66 // Name of boolean to enable stale DNS experiment.
67 const char kStaleDnsEnable[] = "enable";
68 // Name of integer delay in milliseconds before a stale DNS result will be
69 // used.
70 const char kStaleDnsDelayMs[] = "delay_ms";
71 // Name of integer maximum age (past expiration) in milliseconds of a stale DNS
72 // result that will be used, or 0 for no limit.
73 const char kStaleDnsMaxExpiredTimeMs[] = "max_expired_time_ms";
74 // Name of integer maximum times each stale DNS result can be used, or 0 for no
75 // limit.
76 const char kStaleDnsMaxStaleUses[] = "max_stale_uses";
77 // Name of boolean to allow stale DNS results from other networks to be used on
78 // the current network.
79 const char kStaleDnsAllowOtherNetwork[] = "allow_other_network";
80
63 const char kSSLKeyLogFile[] = "ssl_key_log_file"; 81 const char kSSLKeyLogFile[] = "ssl_key_log_file";
64 82
65 void ParseAndSetExperimentalOptions( 83 void ParseAndSetExperimentalOptions(
66 const std::string& experimental_options, 84 const std::string& experimental_options,
67 net::URLRequestContextBuilder* context_builder, 85 net::URLRequestContextBuilder* context_builder,
68 net::NetLog* net_log, 86 net::NetLog* net_log,
69 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) { 87 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) {
70 if (experimental_options.empty()) 88 if (experimental_options.empty())
71 return; 89 return;
72 90
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 } 208 }
191 209
192 bool quic_race_cert_verification = false; 210 bool quic_race_cert_verification = false;
193 if (quic_args->GetBoolean(kQuicRaceCertVerification, 211 if (quic_args->GetBoolean(kQuicRaceCertVerification,
194 &quic_race_cert_verification)) { 212 &quic_race_cert_verification)) {
195 context_builder->set_quic_race_cert_verification( 213 context_builder->set_quic_race_cert_verification(
196 quic_race_cert_verification); 214 quic_race_cert_verification);
197 } 215 }
198 } 216 }
199 217
218 bool async_dns_enable = false;
219 bool stale_dns_enable = false;
220 StaleHostResolver::StaleOptions stale_dns_options;
221
200 const base::DictionaryValue* async_dns_args = nullptr; 222 const base::DictionaryValue* async_dns_args = nullptr;
201 if (dict->GetDictionary(kAsyncDnsFieldTrialName, &async_dns_args)) { 223 if (dict->GetDictionary(kAsyncDnsFieldTrialName, &async_dns_args))
202 bool async_dns_enable = false; 224 async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable);
203 if (async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable) && 225
204 async_dns_enable) { 226 const base::DictionaryValue* stale_dns_args = nullptr;
205 if (net_log == nullptr) { 227 if (dict->GetDictionary(kStaleDnsFieldTrialName, &stale_dns_args)) {
206 DCHECK(false) << "AsyncDNS experiment requires NetLog."; 228 if (stale_dns_args->GetBoolean(kStaleDnsEnable, &stale_dns_enable) &&
207 } else { 229 stale_dns_enable) {
208 std::unique_ptr<net::HostResolver> host_resolver( 230 int delay;
209 net::HostResolver::CreateDefaultResolver(net_log)); 231 if (stale_dns_args->GetInteger(kStaleDnsDelayMs, &delay))
210 host_resolver->SetDnsClientEnabled(true); 232 stale_dns_options.delay = base::TimeDelta::FromMilliseconds(delay);
211 context_builder->set_host_resolver(std::move(host_resolver)); 233 int max_expired_time_ms;
234 if (stale_dns_args->GetInteger(kStaleDnsMaxExpiredTimeMs,
235 &max_expired_time_ms)) {
236 stale_dns_options.max_expired_time =
237 base::TimeDelta::FromMilliseconds(max_expired_time_ms);
238 }
239 int max_stale_uses;
240 if (stale_dns_args->GetInteger(kStaleDnsMaxStaleUses, &max_stale_uses))
241 stale_dns_options.max_stale_uses = max_stale_uses;
242 bool allow_other_network;
243 if (stale_dns_args->GetBoolean(kStaleDnsAllowOtherNetwork,
244 &allow_other_network)) {
245 stale_dns_options.allow_other_network = allow_other_network;
212 } 246 }
213 } 247 }
214 } 248 }
215 249
250 if (async_dns_enable || stale_dns_enable) {
251 if (net_log == nullptr)
252 CHECK(false) << "AsyncDNS and StaleDNS experiments require NetLog.";
253 std::unique_ptr<net::HostResolver> host_resolver;
254 if (stale_dns_enable) {
255 host_resolver.reset(new StaleHostResolver(
256 net::HostResolver::CreateDefaultResolverImpl(net_log),
257 stale_dns_options));
258 } else {
259 host_resolver = net::HostResolver::CreateDefaultResolver(net_log);
260 }
261 if (async_dns_enable)
262 host_resolver->SetDnsClientEnabled(true);
263 context_builder->set_host_resolver(std::move(host_resolver));
264 }
265
216 std::string ssl_key_log_file_string; 266 std::string ssl_key_log_file_string;
217 if (dict->GetString(kSSLKeyLogFile, &ssl_key_log_file_string)) { 267 if (dict->GetString(kSSLKeyLogFile, &ssl_key_log_file_string)) {
218 DCHECK(file_task_runner); 268 DCHECK(file_task_runner);
219 base::FilePath ssl_key_log_file(ssl_key_log_file_string); 269 base::FilePath ssl_key_log_file(ssl_key_log_file_string);
220 if (!ssl_key_log_file.empty() && file_task_runner) { 270 if (!ssl_key_log_file.empty() && file_task_runner) {
221 // SetSSLKeyLogFile is only safe to call before any SSLClientSockets are 271 // SetSSLKeyLogFile is only safe to call before any SSLClientSockets are
222 // created. This should not be used if there are multiple CronetEngine. 272 // created. This should not be used if there are multiple CronetEngine.
223 // TODO(xunjieli): Expose this as a stable API after crbug.com/458365 is 273 // TODO(xunjieli): Expose this as a stable API after crbug.com/458365 is
224 // resolved. 274 // resolved.
225 net::SSLClientSocket::SetSSLKeyLogFile(ssl_key_log_file, 275 net::SSLClientSocket::SetSSLKeyLogFile(ssl_key_log_file,
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 std::move(mock_cert_verifier)); 376 std::move(mock_cert_verifier));
327 } else { 377 } else {
328 // net::CertVerifier::CreateDefault() returns a CachingCertVerifier. 378 // net::CertVerifier::CreateDefault() returns a CachingCertVerifier.
329 cert_verifier = net::CertVerifier::CreateDefault(); 379 cert_verifier = net::CertVerifier::CreateDefault();
330 } 380 }
331 context_builder->SetCertVerifier(std::move(cert_verifier)); 381 context_builder->SetCertVerifier(std::move(cert_verifier));
332 // TODO(mef): Use |config| to set cookies. 382 // TODO(mef): Use |config| to set cookies.
333 } 383 }
334 384
335 } // namespace cronet 385 } // namespace cronet
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698