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

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

Issue 1817553002: Add host resolver rules experimental flag for Cronet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: delete registerHostResolverProc and rebase Created 4 years, 5 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 "net/cert/caching_cert_verifier.h" 17 #include "net/cert/caching_cert_verifier.h"
18 #include "net/cert/cert_verifier.h" 18 #include "net/cert/cert_verifier.h"
19 #include "net/cert/cert_verify_proc.h" 19 #include "net/cert/cert_verify_proc.h"
20 #include "net/cert/multi_threaded_cert_verifier.h" 20 #include "net/cert/multi_threaded_cert_verifier.h"
21 #include "net/dns/host_resolver.h" 21 #include "net/dns/host_resolver.h"
22 #include "net/dns/mapped_host_resolver.h"
22 #include "net/http/http_server_properties.h" 23 #include "net/http/http_server_properties.h"
23 #include "net/quic/quic_protocol.h" 24 #include "net/quic/quic_protocol.h"
24 #include "net/quic/quic_utils.h" 25 #include "net/quic/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"
27 28
28 namespace cronet { 29 namespace cronet {
29 30
30 namespace { 31 namespace {
31 32
(...skipping 20 matching lines...) Expand all
52 const char kQuicUserAgentId[] = "user_agent_id"; 53 const char kQuicUserAgentId[] = "user_agent_id";
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 57
57 // AsyncDNS experiment dictionary name. 58 // AsyncDNS experiment dictionary name.
58 const char kAsyncDnsFieldTrialName[] = "AsyncDNS"; 59 const char kAsyncDnsFieldTrialName[] = "AsyncDNS";
59 // Name of boolean to enable AsyncDNS experiment. 60 // Name of boolean to enable AsyncDNS experiment.
60 const char kAsyncDnsEnable[] = "enable"; 61 const char kAsyncDnsEnable[] = "enable";
61 62
63 // Rules to override DNS resolution. Intended for testing.
64 // See explanation of format in net/dns/mapped_host_resolver.h.
65 const char kHostResolverRulesFieldTrialName[] = "HostResolverRules";
66 const char kHostResolverRules[] = "host_resolver_rules";
67
62 const char kSSLKeyLogFile[] = "ssl_key_log_file"; 68 const char kSSLKeyLogFile[] = "ssl_key_log_file";
63 69
64 void ParseAndSetExperimentalOptions( 70 void ParseAndSetExperimentalOptions(
65 const std::string& experimental_options, 71 const std::string& experimental_options,
66 net::URLRequestContextBuilder* context_builder, 72 net::URLRequestContextBuilder* context_builder,
67 net::NetLog* net_log, 73 net::NetLog* net_log,
68 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) { 74 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) {
69 if (experimental_options.empty()) 75 if (experimental_options.empty())
70 return; 76 return;
71 77
78 DCHECK(net_log);
79
72 DVLOG(1) << "Experimental Options:" << experimental_options; 80 DVLOG(1) << "Experimental Options:" << experimental_options;
73 std::unique_ptr<base::Value> options = 81 std::unique_ptr<base::Value> options =
74 base::JSONReader::Read(experimental_options); 82 base::JSONReader::Read(experimental_options);
75 83
76 if (!options) { 84 if (!options) {
77 DCHECK(false) << "Parsing experimental options failed: " 85 DCHECK(false) << "Parsing experimental options failed: "
78 << experimental_options; 86 << experimental_options;
79 return; 87 return;
80 } 88 }
81 89
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 } 190 }
183 191
184 bool quic_disable_bidirectional_streams = false; 192 bool quic_disable_bidirectional_streams = false;
185 if (quic_args->GetBoolean(kQuicDisableBidirectionalStreams, 193 if (quic_args->GetBoolean(kQuicDisableBidirectionalStreams,
186 &quic_disable_bidirectional_streams)) { 194 &quic_disable_bidirectional_streams)) {
187 context_builder->set_quic_disable_bidirectional_streams( 195 context_builder->set_quic_disable_bidirectional_streams(
188 quic_disable_bidirectional_streams); 196 quic_disable_bidirectional_streams);
189 } 197 }
190 } 198 }
191 199
200 std::unique_ptr<net::HostResolver> host_resolver =
201 net::HostResolver::CreateDefaultResolver(net_log);
202
192 const base::DictionaryValue* async_dns_args = nullptr; 203 const base::DictionaryValue* async_dns_args = nullptr;
193 if (dict->GetDictionary(kAsyncDnsFieldTrialName, &async_dns_args)) { 204 if (dict->GetDictionary(kAsyncDnsFieldTrialName, &async_dns_args)) {
194 bool async_dns_enable = false; 205 bool async_dns_enable = false;
195 if (async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable) && 206 if (async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable) &&
196 async_dns_enable) { 207 async_dns_enable) {
197 if (net_log == nullptr) { 208 host_resolver->SetDnsClientEnabled(true);
198 DCHECK(false) << "AsyncDNS experiment requires NetLog.";
199 } else {
200 std::unique_ptr<net::HostResolver> host_resolver(
201 net::HostResolver::CreateDefaultResolver(net_log));
202 host_resolver->SetDnsClientEnabled(true);
203 context_builder->set_host_resolver(std::move(host_resolver));
204 }
205 } 209 }
206 } 210 }
207 211
212 const base::DictionaryValue* host_resolver_args = nullptr;
213 if (dict->GetDictionary(kHostResolverRulesFieldTrialName,
214 &host_resolver_args)) {
215 std::string host_resolver_rules;
216 if (host_resolver_args->GetString(kHostResolverRules,
217 &host_resolver_rules)) {
218 std::unique_ptr<net::MappedHostResolver> remapped_resolver(
219 new net::MappedHostResolver(std::move(host_resolver)));
220 remapped_resolver->SetRulesFromString(host_resolver_rules);
221 host_resolver = std::move(remapped_resolver);
222 }
223 }
224
225 context_builder->set_host_resolver(std::move(host_resolver));
226
208 std::string ssl_key_log_file_string; 227 std::string ssl_key_log_file_string;
209 if (dict->GetString(kSSLKeyLogFile, &ssl_key_log_file_string)) { 228 if (dict->GetString(kSSLKeyLogFile, &ssl_key_log_file_string)) {
210 DCHECK(file_task_runner); 229 DCHECK(file_task_runner);
211 base::FilePath ssl_key_log_file(ssl_key_log_file_string); 230 base::FilePath ssl_key_log_file(ssl_key_log_file_string);
212 if (!ssl_key_log_file.empty() && file_task_runner) { 231 if (!ssl_key_log_file.empty() && file_task_runner) {
213 // SetSSLKeyLogFile is only safe to call before any SSLClientSockets are 232 // SetSSLKeyLogFile is only safe to call before any SSLClientSockets are
214 // created. This should not be used if there are multiple CronetEngine. 233 // created. This should not be used if there are multiple CronetEngine.
215 // TODO(xunjieli): Expose this as a stable API after crbug.com/458365 is 234 // TODO(xunjieli): Expose this as a stable API after crbug.com/458365 is
216 // resolved. 235 // resolved.
217 net::SSLClientSocket::SetSSLKeyLogFile(ssl_key_log_file, 236 net::SSLClientSocket::SetSSLKeyLogFile(ssl_key_log_file,
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 bypass_public_key_pinning_for_local_trust_anchors( 296 bypass_public_key_pinning_for_local_trust_anchors(
278 bypass_public_key_pinning_for_local_trust_anchors), 297 bypass_public_key_pinning_for_local_trust_anchors),
279 cert_verifier_data(cert_verifier_data) {} 298 cert_verifier_data(cert_verifier_data) {}
280 299
281 URLRequestContextConfig::~URLRequestContextConfig() {} 300 URLRequestContextConfig::~URLRequestContextConfig() {}
282 301
283 void URLRequestContextConfig::ConfigureURLRequestContextBuilder( 302 void URLRequestContextConfig::ConfigureURLRequestContextBuilder(
284 net::URLRequestContextBuilder* context_builder, 303 net::URLRequestContextBuilder* context_builder,
285 net::NetLog* net_log, 304 net::NetLog* net_log,
286 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) { 305 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) {
306 DCHECK(net_log);
307
287 std::string config_cache; 308 std::string config_cache;
288 if (http_cache != DISABLED) { 309 if (http_cache != DISABLED) {
289 net::URLRequestContextBuilder::HttpCacheParams cache_params; 310 net::URLRequestContextBuilder::HttpCacheParams cache_params;
290 if (http_cache == DISK && !storage_path.empty()) { 311 if (http_cache == DISK && !storage_path.empty()) {
291 cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::DISK; 312 cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::DISK;
292 cache_params.path = 313 cache_params.path =
293 base::FilePath(storage_path) 314 base::FilePath(storage_path)
294 .Append(FILE_PATH_LITERAL(kDiskCacheDirectoryName)); 315 .Append(FILE_PATH_LITERAL(kDiskCacheDirectoryName));
295 } else { 316 } else {
296 cache_params.type = 317 cache_params.type =
(...skipping 21 matching lines...) Expand all
318 std::move(mock_cert_verifier)); 339 std::move(mock_cert_verifier));
319 } else { 340 } else {
320 // net::CertVerifier::CreateDefault() returns a CachingCertVerifier. 341 // net::CertVerifier::CreateDefault() returns a CachingCertVerifier.
321 cert_verifier = net::CertVerifier::CreateDefault(); 342 cert_verifier = net::CertVerifier::CreateDefault();
322 } 343 }
323 context_builder->SetCertVerifier(std::move(cert_verifier)); 344 context_builder->SetCertVerifier(std::move(cert_verifier));
324 // TODO(mef): Use |config| to set cookies. 345 // TODO(mef): Use |config| to set cookies.
325 } 346 }
326 347
327 } // namespace cronet 348 } // namespace cronet
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698