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

Side by Side Diff: net/socket/client_socket_pool_manager_impl.cc

Issue 135373002: Added SSLHostInfo. Storing of server host info to our standard disk cache. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with TOT Created 6 years, 11 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 | Annotate | Revision Log
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/socket/client_socket_pool_manager_impl.h" 5 #include "net/socket/client_socket_pool_manager_impl.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "net/http/http_network_session.h" 9 #include "net/http/http_network_session.h"
10 #include "net/http/http_proxy_client_socket_pool.h" 10 #include "net/http/http_proxy_client_socket_pool.h"
(...skipping 23 matching lines...) Expand all
34 } // namespace 34 } // namespace
35 35
36 ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl( 36 ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
37 NetLog* net_log, 37 NetLog* net_log,
38 ClientSocketFactory* socket_factory, 38 ClientSocketFactory* socket_factory,
39 HostResolver* host_resolver, 39 HostResolver* host_resolver,
40 CertVerifier* cert_verifier, 40 CertVerifier* cert_verifier,
41 ServerBoundCertService* server_bound_cert_service, 41 ServerBoundCertService* server_bound_cert_service,
42 TransportSecurityState* transport_security_state, 42 TransportSecurityState* transport_security_state,
43 CTVerifier* cert_transparency_verifier, 43 CTVerifier* cert_transparency_verifier,
44 SSLHostInfoFactory* ssl_host_info_factory,
44 const std::string& ssl_session_cache_shard, 45 const std::string& ssl_session_cache_shard,
45 ProxyService* proxy_service, 46 ProxyService* proxy_service,
46 SSLConfigService* ssl_config_service, 47 SSLConfigService* ssl_config_service,
47 HttpNetworkSession::SocketPoolType pool_type) 48 HttpNetworkSession::SocketPoolType pool_type)
48 : net_log_(net_log), 49 : net_log_(net_log),
49 socket_factory_(socket_factory), 50 socket_factory_(socket_factory),
50 host_resolver_(host_resolver), 51 host_resolver_(host_resolver),
51 cert_verifier_(cert_verifier), 52 cert_verifier_(cert_verifier),
52 server_bound_cert_service_(server_bound_cert_service), 53 server_bound_cert_service_(server_bound_cert_service),
53 transport_security_state_(transport_security_state), 54 transport_security_state_(transport_security_state),
54 cert_transparency_verifier_(cert_transparency_verifier), 55 cert_transparency_verifier_(cert_transparency_verifier),
56 ssl_host_info_factory_(ssl_host_info_factory),
55 ssl_session_cache_shard_(ssl_session_cache_shard), 57 ssl_session_cache_shard_(ssl_session_cache_shard),
56 proxy_service_(proxy_service), 58 proxy_service_(proxy_service),
57 ssl_config_service_(ssl_config_service), 59 ssl_config_service_(ssl_config_service),
58 pool_type_(pool_type), 60 pool_type_(pool_type),
59 transport_pool_histograms_("TCP"), 61 transport_pool_histograms_("TCP"),
60 transport_socket_pool_(new TransportClientSocketPool( 62 transport_socket_pool_(new TransportClientSocketPool(
61 max_sockets_per_pool(pool_type), max_sockets_per_group(pool_type), 63 max_sockets_per_pool(pool_type), max_sockets_per_group(pool_type),
62 &transport_pool_histograms_, 64 &transport_pool_histograms_,
63 host_resolver, 65 host_resolver,
64 socket_factory_, 66 socket_factory_,
65 net_log)), 67 net_log)),
66 ssl_pool_histograms_("SSL2"), 68 ssl_pool_histograms_("SSL2"),
67 ssl_socket_pool_(new SSLClientSocketPool( 69 ssl_socket_pool_(new SSLClientSocketPool(
68 max_sockets_per_pool(pool_type), max_sockets_per_group(pool_type), 70 max_sockets_per_pool(pool_type), max_sockets_per_group(pool_type),
69 &ssl_pool_histograms_, 71 &ssl_pool_histograms_,
70 host_resolver, 72 host_resolver,
71 cert_verifier, 73 cert_verifier,
72 server_bound_cert_service, 74 server_bound_cert_service,
73 transport_security_state, 75 transport_security_state,
74 cert_transparency_verifier, 76 cert_transparency_verifier,
77 ssl_host_info_factory,
75 ssl_session_cache_shard, 78 ssl_session_cache_shard,
76 socket_factory, 79 socket_factory,
77 transport_socket_pool_.get(), 80 transport_socket_pool_.get(),
78 NULL /* no socks proxy */, 81 NULL /* no socks proxy */,
79 NULL /* no http proxy */, 82 NULL /* no http proxy */,
80 ssl_config_service, 83 ssl_config_service,
81 net_log)), 84 net_log)),
82 transport_for_socks_pool_histograms_("TCPforSOCKS"), 85 transport_for_socks_pool_histograms_("TCPforSOCKS"),
83 socks_pool_histograms_("SOCK"), 86 socks_pool_histograms_("SOCK"),
84 transport_for_http_proxy_pool_histograms_("TCPforHTTPProxy"), 87 transport_for_http_proxy_pool_histograms_("TCPforHTTPProxy"),
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 ssl_socket_pools_for_https_proxies_.insert(std::make_pair( 286 ssl_socket_pools_for_https_proxies_.insert(std::make_pair(
284 http_proxy, 287 http_proxy,
285 new SSLClientSocketPool(max_sockets_per_proxy_server(pool_type_), 288 new SSLClientSocketPool(max_sockets_per_proxy_server(pool_type_),
286 max_sockets_per_group(pool_type_), 289 max_sockets_per_group(pool_type_),
287 &ssl_for_https_proxy_pool_histograms_, 290 &ssl_for_https_proxy_pool_histograms_,
288 host_resolver_, 291 host_resolver_,
289 cert_verifier_, 292 cert_verifier_,
290 server_bound_cert_service_, 293 server_bound_cert_service_,
291 transport_security_state_, 294 transport_security_state_,
292 cert_transparency_verifier_, 295 cert_transparency_verifier_,
296 ssl_host_info_factory_,
293 ssl_session_cache_shard_, 297 ssl_session_cache_shard_,
294 socket_factory_, 298 socket_factory_,
295 tcp_https_ret.first->second /* https proxy */, 299 tcp_https_ret.first->second /* https proxy */,
296 NULL /* no socks proxy */, 300 NULL /* no socks proxy */,
297 NULL /* no http proxy */, 301 NULL /* no http proxy */,
298 ssl_config_service_.get(), 302 ssl_config_service_.get(),
299 net_log_))); 303 net_log_)));
300 DCHECK(tcp_https_ret.second); 304 DCHECK(tcp_https_ret.second);
301 305
302 std::pair<HTTPProxySocketPoolMap::iterator, bool> ret = 306 std::pair<HTTPProxySocketPoolMap::iterator, bool> ret =
(...skipping 21 matching lines...) Expand all
324 328
325 SSLClientSocketPool* new_pool = new SSLClientSocketPool( 329 SSLClientSocketPool* new_pool = new SSLClientSocketPool(
326 max_sockets_per_proxy_server(pool_type_), 330 max_sockets_per_proxy_server(pool_type_),
327 max_sockets_per_group(pool_type_), 331 max_sockets_per_group(pool_type_),
328 &ssl_pool_histograms_, 332 &ssl_pool_histograms_,
329 host_resolver_, 333 host_resolver_,
330 cert_verifier_, 334 cert_verifier_,
331 server_bound_cert_service_, 335 server_bound_cert_service_,
332 transport_security_state_, 336 transport_security_state_,
333 cert_transparency_verifier_, 337 cert_transparency_verifier_,
338 ssl_host_info_factory_,
334 ssl_session_cache_shard_, 339 ssl_session_cache_shard_,
335 socket_factory_, 340 socket_factory_,
336 NULL, /* no tcp pool, we always go through a proxy */ 341 NULL, /* no tcp pool, we always go through a proxy */
337 GetSocketPoolForSOCKSProxy(proxy_server), 342 GetSocketPoolForSOCKSProxy(proxy_server),
338 GetSocketPoolForHTTPProxy(proxy_server), 343 GetSocketPoolForHTTPProxy(proxy_server),
339 ssl_config_service_.get(), 344 ssl_config_service_.get(),
340 net_log_); 345 net_log_);
341 346
342 std::pair<SSLSocketPoolMap::iterator, bool> ret = 347 std::pair<SSLSocketPoolMap::iterator, bool> ret =
343 ssl_socket_pools_for_proxies_.insert(std::make_pair(proxy_server, 348 ssl_socket_pools_for_proxies_.insert(std::make_pair(proxy_server,
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 // We should not flush the socket pools if we added trust to a 393 // We should not flush the socket pools if we added trust to a
389 // cert. 394 // cert.
390 // 395 //
391 // Since the OnCACertChanged method doesn't tell us what 396 // Since the OnCACertChanged method doesn't tell us what
392 // kind of change it is, we have to flush the socket 397 // kind of change it is, we have to flush the socket
393 // pools to be safe. 398 // pools to be safe.
394 FlushSocketPoolsWithError(ERR_NETWORK_CHANGED); 399 FlushSocketPoolsWithError(ERR_NETWORK_CHANGED);
395 } 400 }
396 401
397 } // namespace net 402 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698