Allow chrome to handle 407 auth challenges to CONNECT requests

net/http/http_proxy_client_socket_pool.h

Index: net/http/http_proxy_client_socket_pool.h
===================================================================
--- net/http/http_proxy_client_socket_pool.h	(revision 117986)
+++ net/http/http_proxy_client_socket_pool.h	(working copy)
@@ -26,6 +26,7 @@
 
 class HostResolver;
 class HttpAuthCache;
+class HttpAuthController;
 class HttpAuthHandlerFactory;
 class SSLClientSocketPool;
 class SSLSocketParams;
@@ -34,6 +35,17 @@
 class TransportClientSocketPool;
 class TransportSocketParams;
 
+// Called when a 407 Proxy Authentication Required response is received
+// from an HTTP proxy when attempting to establish a CONNECT tunnel to

[cbentzel, 2012/01/20 02:09:46]

Is this also in the HTTPS proxy case as well? I don't really know how we are
doing HTTPS tunneling through an HTTPS proxy.

[Ryan Hamilton, 2012/01/20 04:20:04]

Yes, good point.  I've updated the comment to include HTTPS.  (Tunneling through
an HTTPS proxy is just like tunneling through and HTTP proxy, except that we get
an SSLClientSocket to the proxy instead of a TCPClientSocket to the proxy.  Once
we have this socket, we wrap it with an HttpProxyClientSocket and issue a
CONNECT request)

+// an HTTPS server.  Information about the challenge can be found in
+// the HttpResponse info.  Credentials should be added to the
+// HttpAuthController, and the CompletionCallback should be invoked
+// with the status.
+typedef base::Callback<void (const HttpResponseInfo&,
+                             HttpAuthController*,
+                             CompletionCallback)>
+    TunnelAuthNeededCB;

[vandebo (ex-Chrome), 2012/01/19 20:12:49]

Chrome style says not to abbreviate, also needed makes this hard to read.  Would
TunnelAuthCallback be ok?

[Ryan Hamilton, 2012/01/19 23:11:19]

Done.

+
 // HttpProxySocketParams only needs the socket params for one of the proxy
 // types.  The other param must be NULL.  When using an HTTP Proxy,
 // |transport_params| must be set.  When using an HTTPS Proxy, |ssl_params|
@@ -50,7 +62,8 @@
       HttpAuthCache* http_auth_cache,
       HttpAuthHandlerFactory* http_auth_handler_factory,
       SpdySessionPool* spdy_session_pool,
-      bool tunnel);
+      bool tunnel,
+      TunnelAuthNeededCB auth_needed_callback);
 
   const scoped_refptr<TransportSocketParams>& transport_params() const {
     return transport_params_;
@@ -71,6 +84,7 @@
   const HostResolver::RequestInfo& destination() const;
   bool tunnel() const { return tunnel_; }
   bool ignore_limits() const { return ignore_limits_; }
+  TunnelAuthNeededCB auth_needed_callback() { return auth_needed_callback_; }
 
  private:
   friend class base::RefCounted<HttpProxySocketParams>;
@@ -86,6 +100,7 @@
   HttpAuthHandlerFactory* const http_auth_handler_factory_;
   const bool tunnel_;
   bool ignore_limits_;
+  TunnelAuthNeededCB auth_needed_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpProxySocketParams);
 };
@@ -120,6 +135,8 @@
     STATE_SPDY_PROXY_CREATE_STREAM,
     STATE_SPDY_PROXY_CREATE_STREAM_COMPLETE,
     STATE_SPDY_PROXY_CONNECT_COMPLETE,
+    STATE_RESTART_WITH_AUTH,
+    STATE_RESTART_WITH_AUTH_COMPLETE,
     STATE_NONE,
   };
 
@@ -141,6 +158,11 @@
   int DoSpdyProxyCreateStream();
   int DoSpdyProxyCreateStreamComplete(int result);
 
+  int DoRestartWithAuth();
+  int DoRestartWithAuthComplete(int result);
+
+  void HandleProxyAuthChallenge();
+
   // Begins the tcp connection and the optional Http proxy tunnel.  If the
   // request is not immediately servicable (likely), the request will return
   // ERR_IO_PENDING. An OK return from this function or the callback means
@@ -167,6 +189,11 @@
 
   scoped_refptr<SpdyStream> spdy_stream_;
 
+  // AuthController to be used for *all* requests when setting up this tunnel.
+  scoped_refptr<HttpAuthController> auth_;
+
+  base::WeakPtrFactory<HttpProxyConnectJob> ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob);
 };