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

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

Issue 76443006: Certificate Transparency: Threading the CT verifier into the SSL client socket. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reverted changes to cert_status_flags, added error code Created 7 years 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 #ifndef NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_ 5 #ifndef NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_
6 #define NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_ 6 #define NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/template_util.h" 14 #include "base/template_util.h"
15 #include "base/threading/non_thread_safe.h" 15 #include "base/threading/non_thread_safe.h"
16 #include "net/cert/cert_database.h" 16 #include "net/cert/cert_database.h"
17 #include "net/http/http_network_session.h" 17 #include "net/http/http_network_session.h"
18 #include "net/socket/client_socket_pool_histograms.h" 18 #include "net/socket/client_socket_pool_histograms.h"
19 #include "net/socket/client_socket_pool_manager.h" 19 #include "net/socket/client_socket_pool_manager.h"
20 20
21 namespace net { 21 namespace net {
22 22
23 class CertVerifier; 23 class CertVerifier;
24 class ClientSocketFactory; 24 class ClientSocketFactory;
25 class ClientSocketPoolHistograms; 25 class ClientSocketPoolHistograms;
26 class CTVerifier;
26 class HttpProxyClientSocketPool; 27 class HttpProxyClientSocketPool;
27 class HostResolver; 28 class HostResolver;
28 class NetLog; 29 class NetLog;
29 class ServerBoundCertService; 30 class ServerBoundCertService;
30 class ProxyService; 31 class ProxyService;
31 class SOCKSClientSocketPool; 32 class SOCKSClientSocketPool;
32 class SSLClientSocketPool; 33 class SSLClientSocketPool;
33 class SSLConfigService; 34 class SSLConfigService;
34 class TransportClientSocketPool; 35 class TransportClientSocketPool;
35 class TransportSecurityState; 36 class TransportSecurityState;
(...skipping 19 matching lines...) Expand all
55 class ClientSocketPoolManagerImpl : public base::NonThreadSafe, 56 class ClientSocketPoolManagerImpl : public base::NonThreadSafe,
56 public ClientSocketPoolManager, 57 public ClientSocketPoolManager,
57 public CertDatabase::Observer { 58 public CertDatabase::Observer {
58 public: 59 public:
59 ClientSocketPoolManagerImpl(NetLog* net_log, 60 ClientSocketPoolManagerImpl(NetLog* net_log,
60 ClientSocketFactory* socket_factory, 61 ClientSocketFactory* socket_factory,
61 HostResolver* host_resolver, 62 HostResolver* host_resolver,
62 CertVerifier* cert_verifier, 63 CertVerifier* cert_verifier,
63 ServerBoundCertService* server_bound_cert_service, 64 ServerBoundCertService* server_bound_cert_service,
64 TransportSecurityState* transport_security_state, 65 TransportSecurityState* transport_security_state,
66 CTVerifier* cert_transparency_verifier,
65 const std::string& ssl_session_cache_shard, 67 const std::string& ssl_session_cache_shard,
66 ProxyService* proxy_service, 68 ProxyService* proxy_service,
67 SSLConfigService* ssl_config_service, 69 SSLConfigService* ssl_config_service,
68 HttpNetworkSession::SocketPoolType pool_type); 70 HttpNetworkSession::SocketPoolType pool_type);
69 virtual ~ClientSocketPoolManagerImpl(); 71 virtual ~ClientSocketPoolManagerImpl();
70 72
71 virtual void FlushSocketPoolsWithError(int error) OVERRIDE; 73 virtual void FlushSocketPoolsWithError(int error) OVERRIDE;
72 virtual void CloseIdleSockets() OVERRIDE; 74 virtual void CloseIdleSockets() OVERRIDE;
73 75
74 virtual TransportClientSocketPool* GetTransportSocketPool() OVERRIDE; 76 virtual TransportClientSocketPool* GetTransportSocketPool() OVERRIDE;
(...skipping 26 matching lines...) Expand all
101 HTTPProxySocketPoolMap; 103 HTTPProxySocketPoolMap;
102 typedef internal::OwnedPoolMap<HostPortPair, SSLClientSocketPool*> 104 typedef internal::OwnedPoolMap<HostPortPair, SSLClientSocketPool*>
103 SSLSocketPoolMap; 105 SSLSocketPoolMap;
104 106
105 NetLog* const net_log_; 107 NetLog* const net_log_;
106 ClientSocketFactory* const socket_factory_; 108 ClientSocketFactory* const socket_factory_;
107 HostResolver* const host_resolver_; 109 HostResolver* const host_resolver_;
108 CertVerifier* const cert_verifier_; 110 CertVerifier* const cert_verifier_;
109 ServerBoundCertService* const server_bound_cert_service_; 111 ServerBoundCertService* const server_bound_cert_service_;
110 TransportSecurityState* const transport_security_state_; 112 TransportSecurityState* const transport_security_state_;
113 CTVerifier* const cert_transparency_verifier_;
111 const std::string ssl_session_cache_shard_; 114 const std::string ssl_session_cache_shard_;
112 ProxyService* const proxy_service_; 115 ProxyService* const proxy_service_;
113 const scoped_refptr<SSLConfigService> ssl_config_service_; 116 const scoped_refptr<SSLConfigService> ssl_config_service_;
114 const HttpNetworkSession::SocketPoolType pool_type_; 117 const HttpNetworkSession::SocketPoolType pool_type_;
115 118
116 // Note: this ordering is important. 119 // Note: this ordering is important.
117 120
118 ClientSocketPoolHistograms transport_pool_histograms_; 121 ClientSocketPoolHistograms transport_pool_histograms_;
119 scoped_ptr<TransportClientSocketPool> transport_socket_pool_; 122 scoped_ptr<TransportClientSocketPool> transport_socket_pool_;
120 123
(...skipping 20 matching lines...) Expand all
141 144
142 ClientSocketPoolHistograms ssl_socket_pool_for_proxies_histograms_; 145 ClientSocketPoolHistograms ssl_socket_pool_for_proxies_histograms_;
143 SSLSocketPoolMap ssl_socket_pools_for_proxies_; 146 SSLSocketPoolMap ssl_socket_pools_for_proxies_;
144 147
145 DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolManagerImpl); 148 DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolManagerImpl);
146 }; 149 };
147 150
148 } // namespace net 151 } // namespace net
149 152
150 #endif // NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_ 153 #endif // NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698