Correctly handle SSL Client Authentication requests when connecting...

net/socket/client_socket_factory.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_SOCKET_CLIENT_SOCKET_FACTORY_H_
 #define NET_SOCKET_CLIENT_SOCKET_FACTORY_H_
 #pragma once
 
 #include <string>
 
+#include "base/basictypes.h"
 #include "net/base/net_log.h"
 
 namespace net {
 
 class AddressList;
 class ClientSocket;
 class ClientSocketHandle;
 class DnsRRResolver;
 class SSLClientSocket;
 struct SSLConfig;
 class SSLHostInfo;
 
 // Callback function to create new SSLClientSocket objects.
 typedef SSLClientSocket* (*SSLClientSocketFactory)(
     ClientSocketHandle* transport_socket,
     const std::string& hostname,
+    uint16 port,
     const SSLConfig& ssl_config,
     SSLHostInfo* ssl_host_info,
     DnsRRResolver* dnsrr_resolver);
 
 // An interface used to instantiate ClientSocket objects.  Used to facilitate
 // testing code with mock socket implementations.
 class ClientSocketFactory {
  public:
   virtual ~ClientSocketFactory() {}
 
   // |source| is the NetLog::Source for the entity trying to create the socket,
   // if it has one.
   virtual ClientSocket* CreateTCPClientSocket(
       const AddressList& addresses,
       NetLog* net_log,
       const NetLog::Source& source) = 0;
 
   virtual SSLClientSocket* CreateSSLClientSocket(
       ClientSocketHandle* transport_socket,
       const std::string& hostname,
+      uint16 port,

[eroman, 2010/11/11 19:18:31]

Please change the function signature to take a |const HostPortPair&| instead.

The advantage of HostPortPair is it is more expressive, and allows us to do
assertions more uniformly. With naked "hostname" parameters we have run into
problems needing to explain at every single callsite what sort of data it
contains. i.e. does it include square brackets around IPv6 literals? Is it
already canonicalized? etc... By passing around a HostPortPair instead we can
enforce and document those expectations more uniformly in one chokepoint. And
assert at construction time that it is good.

       const SSLConfig& ssl_config,
       SSLHostInfo* ssl_host_info,
       DnsRRResolver* dnsrr_resolver) = 0;
 
   // Deprecated function (http://crbug.com/37810) that takes a ClientSocket.
   virtual SSLClientSocket* CreateSSLClientSocket(ClientSocket* transport_socket,
                                                  const std::string& hostname,
+                                                 uint16 port,
                                                  const SSLConfig& ssl_config,
                                                  SSLHostInfo* ssl_host_info);
 
   // Returns the default ClientSocketFactory.
   static ClientSocketFactory* GetDefaultFactory();
 
   // Instructs the default ClientSocketFactory to use |factory| to create
   // SSLClientSocket objects.
   static void SetSSLClientSocketFactory(SSLClientSocketFactory factory);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_CLIENT_SOCKET_FACTORY_H_