OLD | NEW |
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/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" |
27 | 28 |
28 namespace cronet { | 29 namespace cronet { |
29 | 30 |
30 namespace { | 31 namespace { |
31 | 32 |
(...skipping 21 matching lines...) Expand all Loading... |
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 // Rules to override DNS resolution. Intended for testing. |
| 65 // See explanation of format in net/dns/mapped_host_resolver.h. |
| 66 const char kHostResolverRulesFieldTrialName[] = "HostResolverRules"; |
| 67 const char kHostResolverRules[] = "host_resolver_rules"; |
| 68 |
63 const char kSSLKeyLogFile[] = "ssl_key_log_file"; | 69 const char kSSLKeyLogFile[] = "ssl_key_log_file"; |
64 | 70 |
65 void ParseAndSetExperimentalOptions( | 71 void ParseAndSetExperimentalOptions( |
66 const std::string& experimental_options, | 72 const std::string& experimental_options, |
67 net::URLRequestContextBuilder* context_builder, | 73 net::URLRequestContextBuilder* context_builder, |
68 net::NetLog* net_log, | 74 net::NetLog* net_log, |
69 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) { | 75 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) { |
70 if (experimental_options.empty()) | 76 if (experimental_options.empty()) |
71 return; | 77 return; |
72 | 78 |
| 79 DCHECK(net_log); |
| 80 |
73 DVLOG(1) << "Experimental Options:" << experimental_options; | 81 DVLOG(1) << "Experimental Options:" << experimental_options; |
74 std::unique_ptr<base::Value> options = | 82 std::unique_ptr<base::Value> options = |
75 base::JSONReader::Read(experimental_options); | 83 base::JSONReader::Read(experimental_options); |
76 | 84 |
77 if (!options) { | 85 if (!options) { |
78 DCHECK(false) << "Parsing experimental options failed: " | 86 DCHECK(false) << "Parsing experimental options failed: " |
79 << experimental_options; | 87 << experimental_options; |
80 return; | 88 return; |
81 } | 89 } |
82 | 90 |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 } | 198 } |
191 | 199 |
192 bool quic_race_cert_verification = false; | 200 bool quic_race_cert_verification = false; |
193 if (quic_args->GetBoolean(kQuicRaceCertVerification, | 201 if (quic_args->GetBoolean(kQuicRaceCertVerification, |
194 &quic_race_cert_verification)) { | 202 &quic_race_cert_verification)) { |
195 context_builder->set_quic_race_cert_verification( | 203 context_builder->set_quic_race_cert_verification( |
196 quic_race_cert_verification); | 204 quic_race_cert_verification); |
197 } | 205 } |
198 } | 206 } |
199 | 207 |
| 208 std::unique_ptr<net::HostResolver> host_resolver = |
| 209 net::HostResolver::CreateDefaultResolver(net_log); |
| 210 |
200 const base::DictionaryValue* async_dns_args = nullptr; | 211 const base::DictionaryValue* async_dns_args = nullptr; |
201 if (dict->GetDictionary(kAsyncDnsFieldTrialName, &async_dns_args)) { | 212 if (dict->GetDictionary(kAsyncDnsFieldTrialName, &async_dns_args)) { |
202 bool async_dns_enable = false; | 213 bool async_dns_enable = false; |
203 if (async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable) && | 214 if (async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable) && |
204 async_dns_enable) { | 215 async_dns_enable) { |
205 if (net_log == nullptr) { | 216 host_resolver->SetDnsClientEnabled(true); |
206 DCHECK(false) << "AsyncDNS experiment requires NetLog."; | |
207 } else { | |
208 std::unique_ptr<net::HostResolver> host_resolver( | |
209 net::HostResolver::CreateDefaultResolver(net_log)); | |
210 host_resolver->SetDnsClientEnabled(true); | |
211 context_builder->set_host_resolver(std::move(host_resolver)); | |
212 } | |
213 } | 217 } |
214 } | 218 } |
215 | 219 |
| 220 const base::DictionaryValue* host_resolver_args = nullptr; |
| 221 if (dict->GetDictionary(kHostResolverRulesFieldTrialName, |
| 222 &host_resolver_args)) { |
| 223 std::string host_resolver_rules; |
| 224 if (host_resolver_args->GetString(kHostResolverRules, |
| 225 &host_resolver_rules)) { |
| 226 std::unique_ptr<net::MappedHostResolver> remapped_resolver( |
| 227 new net::MappedHostResolver(std::move(host_resolver))); |
| 228 remapped_resolver->SetRulesFromString(host_resolver_rules); |
| 229 host_resolver = std::move(remapped_resolver); |
| 230 } |
| 231 } |
| 232 |
| 233 context_builder->set_host_resolver(std::move(host_resolver)); |
| 234 |
216 std::string ssl_key_log_file_string; | 235 std::string ssl_key_log_file_string; |
217 if (dict->GetString(kSSLKeyLogFile, &ssl_key_log_file_string)) { | 236 if (dict->GetString(kSSLKeyLogFile, &ssl_key_log_file_string)) { |
218 DCHECK(file_task_runner); | 237 DCHECK(file_task_runner); |
219 base::FilePath ssl_key_log_file(ssl_key_log_file_string); | 238 base::FilePath ssl_key_log_file(ssl_key_log_file_string); |
220 if (!ssl_key_log_file.empty() && file_task_runner) { | 239 if (!ssl_key_log_file.empty() && file_task_runner) { |
221 // SetSSLKeyLogFile is only safe to call before any SSLClientSockets are | 240 // SetSSLKeyLogFile is only safe to call before any SSLClientSockets are |
222 // created. This should not be used if there are multiple CronetEngine. | 241 // 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 | 242 // TODO(xunjieli): Expose this as a stable API after crbug.com/458365 is |
224 // resolved. | 243 // resolved. |
225 net::SSLClientSocket::SetSSLKeyLogFile(ssl_key_log_file, | 244 net::SSLClientSocket::SetSSLKeyLogFile(ssl_key_log_file, |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 bypass_public_key_pinning_for_local_trust_anchors( | 304 bypass_public_key_pinning_for_local_trust_anchors( |
286 bypass_public_key_pinning_for_local_trust_anchors), | 305 bypass_public_key_pinning_for_local_trust_anchors), |
287 cert_verifier_data(cert_verifier_data) {} | 306 cert_verifier_data(cert_verifier_data) {} |
288 | 307 |
289 URLRequestContextConfig::~URLRequestContextConfig() {} | 308 URLRequestContextConfig::~URLRequestContextConfig() {} |
290 | 309 |
291 void URLRequestContextConfig::ConfigureURLRequestContextBuilder( | 310 void URLRequestContextConfig::ConfigureURLRequestContextBuilder( |
292 net::URLRequestContextBuilder* context_builder, | 311 net::URLRequestContextBuilder* context_builder, |
293 net::NetLog* net_log, | 312 net::NetLog* net_log, |
294 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) { | 313 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) { |
| 314 DCHECK(net_log); |
| 315 |
295 std::string config_cache; | 316 std::string config_cache; |
296 if (http_cache != DISABLED) { | 317 if (http_cache != DISABLED) { |
297 net::URLRequestContextBuilder::HttpCacheParams cache_params; | 318 net::URLRequestContextBuilder::HttpCacheParams cache_params; |
298 if (http_cache == DISK && !storage_path.empty()) { | 319 if (http_cache == DISK && !storage_path.empty()) { |
299 cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::DISK; | 320 cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::DISK; |
300 cache_params.path = | 321 cache_params.path = |
301 base::FilePath(storage_path) | 322 base::FilePath(storage_path) |
302 .Append(FILE_PATH_LITERAL(kDiskCacheDirectoryName)); | 323 .Append(FILE_PATH_LITERAL(kDiskCacheDirectoryName)); |
303 } else { | 324 } else { |
304 cache_params.type = | 325 cache_params.type = |
(...skipping 21 matching lines...) Expand all Loading... |
326 std::move(mock_cert_verifier)); | 347 std::move(mock_cert_verifier)); |
327 } else { | 348 } else { |
328 // net::CertVerifier::CreateDefault() returns a CachingCertVerifier. | 349 // net::CertVerifier::CreateDefault() returns a CachingCertVerifier. |
329 cert_verifier = net::CertVerifier::CreateDefault(); | 350 cert_verifier = net::CertVerifier::CreateDefault(); |
330 } | 351 } |
331 context_builder->SetCertVerifier(std::move(cert_verifier)); | 352 context_builder->SetCertVerifier(std::move(cert_verifier)); |
332 // TODO(mef): Use |config| to set cookies. | 353 // TODO(mef): Use |config| to set cookies. |
333 } | 354 } |
334 | 355 |
335 } // namespace cronet | 356 } // namespace cronet |
OLD | NEW |