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

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: Resolve merge conflict. 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/dns/mapped_host_resolver.h" 23 #include "net/dns/mapped_host_resolver.h"
23 #include "net/http/http_server_properties.h" 24 #include "net/http/http_server_properties.h"
24 #include "net/quic/core/quic_protocol.h" 25 #include "net/quic/core/quic_protocol.h"
25 #include "net/quic/core/quic_utils.h" 26 #include "net/quic/core/quic_utils.h"
26 #include "net/socket/ssl_client_socket.h" 27 #include "net/socket/ssl_client_socket.h"
(...skipping 27 matching lines...) Expand all
54 const char kQuicMigrateSessionsEarly[] = "migrate_sessions_early"; 55 const char kQuicMigrateSessionsEarly[] = "migrate_sessions_early";
55 const char kQuicDisableBidirectionalStreams[] = 56 const char kQuicDisableBidirectionalStreams[] =
56 "quic_disable_bidirectional_streams"; 57 "quic_disable_bidirectional_streams";
57 const char kQuicRaceCertVerification[] = "race_cert_verification"; 58 const char kQuicRaceCertVerification[] = "race_cert_verification";
58 59
59 // AsyncDNS experiment dictionary name. 60 // AsyncDNS experiment dictionary name.
60 const char kAsyncDnsFieldTrialName[] = "AsyncDNS"; 61 const char kAsyncDnsFieldTrialName[] = "AsyncDNS";
61 // Name of boolean to enable AsyncDNS experiment. 62 // Name of boolean to enable AsyncDNS experiment.
62 const char kAsyncDnsEnable[] = "enable"; 63 const char kAsyncDnsEnable[] = "enable";
63 64
65 // Stale DNS (StaleHostResolver) experiment dictionary name.
66 const char kStaleDnsFieldTrialName[] = "StaleDNS";
67 // Name of boolean to enable stale DNS experiment.
68 const char kStaleDnsEnable[] = "enable";
69 // Name of integer delay in milliseconds before a stale DNS result will be
70 // used.
71 const char kStaleDnsDelayMs[] = "delay_ms";
72 // Name of integer maximum age (past expiration) in milliseconds of a stale DNS
73 // result that will be used, or 0 for no limit.
74 const char kStaleDnsMaxExpiredTimeMs[] = "max_expired_time_ms";
75 // Name of integer maximum times each stale DNS result can be used, or 0 for no
76 // limit.
77 const char kStaleDnsMaxStaleUses[] = "max_stale_uses";
78 // Name of boolean to allow stale DNS results from other networks to be used on
79 // the current network.
80 const char kStaleDnsAllowOtherNetwork[] = "allow_other_network";
81
64 // Rules to override DNS resolution. Intended for testing. 82 // Rules to override DNS resolution. Intended for testing.
65 // See explanation of format in net/dns/mapped_host_resolver.h. 83 // See explanation of format in net/dns/mapped_host_resolver.h.
66 const char kHostResolverRulesFieldTrialName[] = "HostResolverRules"; 84 const char kHostResolverRulesFieldTrialName[] = "HostResolverRules";
67 const char kHostResolverRules[] = "host_resolver_rules"; 85 const char kHostResolverRules[] = "host_resolver_rules";
68 86
69 const char kSSLKeyLogFile[] = "ssl_key_log_file"; 87 const char kSSLKeyLogFile[] = "ssl_key_log_file";
70 88
71 void ParseAndSetExperimentalOptions( 89 void ParseAndSetExperimentalOptions(
72 const std::string& experimental_options, 90 const std::string& experimental_options,
73 net::URLRequestContextBuilder* context_builder, 91 net::URLRequestContextBuilder* context_builder,
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 } 216 }
199 217
200 bool quic_race_cert_verification = false; 218 bool quic_race_cert_verification = false;
201 if (quic_args->GetBoolean(kQuicRaceCertVerification, 219 if (quic_args->GetBoolean(kQuicRaceCertVerification,
202 &quic_race_cert_verification)) { 220 &quic_race_cert_verification)) {
203 context_builder->set_quic_race_cert_verification( 221 context_builder->set_quic_race_cert_verification(
204 quic_race_cert_verification); 222 quic_race_cert_verification);
205 } 223 }
206 } 224 }
207 225
208 std::unique_ptr<net::HostResolver> host_resolver = 226 bool async_dns_enable = false;
209 net::HostResolver::CreateDefaultResolver(net_log); 227 bool stale_dns_enable = false;
228 bool host_resolver_rules_enable = false;
229 StaleHostResolver::StaleOptions stale_dns_options;
230 std::string host_resolver_rules_string;
210 231
211 const base::DictionaryValue* async_dns_args = nullptr; 232 const base::DictionaryValue* async_dns_args = nullptr;
212 if (dict->GetDictionary(kAsyncDnsFieldTrialName, &async_dns_args)) { 233 if (dict->GetDictionary(kAsyncDnsFieldTrialName, &async_dns_args))
213 bool async_dns_enable = false; 234 async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable);
214 if (async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable) && 235
215 async_dns_enable) { 236 const base::DictionaryValue* stale_dns_args = nullptr;
216 host_resolver->SetDnsClientEnabled(true); 237 if (dict->GetDictionary(kStaleDnsFieldTrialName, &stale_dns_args)) {
238 if (stale_dns_args->GetBoolean(kStaleDnsEnable, &stale_dns_enable) &&
239 stale_dns_enable) {
240 int delay;
241 if (stale_dns_args->GetInteger(kStaleDnsDelayMs, &delay))
242 stale_dns_options.delay = base::TimeDelta::FromMilliseconds(delay);
243 int max_expired_time_ms;
244 if (stale_dns_args->GetInteger(kStaleDnsMaxExpiredTimeMs,
245 &max_expired_time_ms)) {
246 stale_dns_options.max_expired_time =
247 base::TimeDelta::FromMilliseconds(max_expired_time_ms);
248 }
249 int max_stale_uses;
250 if (stale_dns_args->GetInteger(kStaleDnsMaxStaleUses, &max_stale_uses))
251 stale_dns_options.max_stale_uses = max_stale_uses;
252 bool allow_other_network;
253 if (stale_dns_args->GetBoolean(kStaleDnsAllowOtherNetwork,
254 &allow_other_network)) {
255 stale_dns_options.allow_other_network = allow_other_network;
256 }
217 } 257 }
218 } 258 }
219 259
220 const base::DictionaryValue* host_resolver_args = nullptr; 260 const base::DictionaryValue* host_resolver_rules_args = nullptr;
221 if (dict->GetDictionary(kHostResolverRulesFieldTrialName, 261 if (dict->GetDictionary(kHostResolverRulesFieldTrialName,
222 &host_resolver_args)) { 262 &host_resolver_rules_args)) {
223 std::string host_resolver_rules; 263 host_resolver_rules_enable = host_resolver_rules_args->GetString(
224 if (host_resolver_args->GetString(kHostResolverRules, 264 kHostResolverRules, &host_resolver_rules_string);
225 &host_resolver_rules)) { 265 }
266
267 if (async_dns_enable || stale_dns_enable || host_resolver_rules_enable) {
268 if (net_log == nullptr) {
269 CHECK(false) << "AsyncDNS, StaleDNS, and HostResolverRules experiments "
270 << "require NetLog.";
271 }
272 std::unique_ptr<net::HostResolver> host_resolver;
273 if (stale_dns_enable) {
274 host_resolver.reset(new StaleHostResolver(
275 net::HostResolver::CreateDefaultResolverImpl(net_log),
276 stale_dns_options));
277 } else {
278 host_resolver = net::HostResolver::CreateDefaultResolver(net_log);
279 }
280 if (async_dns_enable)
281 host_resolver->SetDnsClientEnabled(true);
282 if (host_resolver_rules_enable) {
226 std::unique_ptr<net::MappedHostResolver> remapped_resolver( 283 std::unique_ptr<net::MappedHostResolver> remapped_resolver(
227 new net::MappedHostResolver(std::move(host_resolver))); 284 new net::MappedHostResolver(std::move(host_resolver)));
228 remapped_resolver->SetRulesFromString(host_resolver_rules); 285 remapped_resolver->SetRulesFromString(host_resolver_rules_string);
229 host_resolver = std::move(remapped_resolver); 286 host_resolver = std::move(remapped_resolver);
230 } 287 }
288 context_builder->set_host_resolver(std::move(host_resolver));
231 } 289 }
232 290
233 context_builder->set_host_resolver(std::move(host_resolver));
234
235 std::string ssl_key_log_file_string; 291 std::string ssl_key_log_file_string;
236 if (dict->GetString(kSSLKeyLogFile, &ssl_key_log_file_string)) { 292 if (dict->GetString(kSSLKeyLogFile, &ssl_key_log_file_string)) {
237 DCHECK(file_task_runner); 293 DCHECK(file_task_runner);
238 base::FilePath ssl_key_log_file(ssl_key_log_file_string); 294 base::FilePath ssl_key_log_file(ssl_key_log_file_string);
239 if (!ssl_key_log_file.empty() && file_task_runner) { 295 if (!ssl_key_log_file.empty() && file_task_runner) {
240 // SetSSLKeyLogFile is only safe to call before any SSLClientSockets are 296 // SetSSLKeyLogFile is only safe to call before any SSLClientSockets are
241 // created. This should not be used if there are multiple CronetEngine. 297 // created. This should not be used if there are multiple CronetEngine.
242 // TODO(xunjieli): Expose this as a stable API after crbug.com/458365 is 298 // TODO(xunjieli): Expose this as a stable API after crbug.com/458365 is
243 // resolved. 299 // resolved.
244 net::SSLClientSocket::SetSSLKeyLogFile(ssl_key_log_file, 300 net::SSLClientSocket::SetSSLKeyLogFile(ssl_key_log_file,
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 std::move(mock_cert_verifier)); 403 std::move(mock_cert_verifier));
348 } else { 404 } else {
349 // net::CertVerifier::CreateDefault() returns a CachingCertVerifier. 405 // net::CertVerifier::CreateDefault() returns a CachingCertVerifier.
350 cert_verifier = net::CertVerifier::CreateDefault(); 406 cert_verifier = net::CertVerifier::CreateDefault();
351 } 407 }
352 context_builder->SetCertVerifier(std::move(cert_verifier)); 408 context_builder->SetCertVerifier(std::move(cert_verifier));
353 // TODO(mef): Use |config| to set cookies. 409 // TODO(mef): Use |config| to set cookies.
354 } 410 }
355 411
356 } // namespace cronet 412 } // namespace cronet
OLDNEW
« no previous file with comments | « components/cronet/stale_host_resolver_unittest.cc ('k') | components/cronet/url_request_context_config_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698