Allow chrome to handle 407 auth challenges to CONNECT requests

net/spdy/spdy_proxy_client_socket.cc

 // Copyright (c) 2011 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.
 
 #include "net/spdy/spdy_proxy_client_socket.h"
 
 #include <algorithm>  // min
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 45 matching lines @@
 }
 
 SpdyProxyClientSocket::~SpdyProxyClientSocket() {
   Disconnect();
 }
 
 const HttpResponseInfo* SpdyProxyClientSocket::GetConnectResponseInfo() const {
   return response_.headers ? &response_ : NULL;
 }
 
+int SpdyProxyClientSocket::RestartWithAuth(OldCompletionCallback* callback) {
+  // A SPDY Stream can only handle a single request, so the underlying
+  // stream may not be reused and a new SpdyProxyClientSocket must be
+  // created (possibly on top of the same SPDY Session).
+  next_state_ = STATE_DISCONNECTED;
+  return OK;
+}
+
+const
+scoped_refptr<HttpAuthController>& SpdyProxyClientSocket::auth_controller() {
+  return auth_;
+}
+
 HttpStream* SpdyProxyClientSocket::CreateConnectResponseStream() {
   DCHECK(response_stream_.get());
   return response_stream_.release();
 }
 
 // Sends a SYN_STREAM frame to the proxy with a CONNECT request
 // for the specified endpoint.  Waits for the server to send back
 // a SYN_REPLY frame.  OK will be returned if the status is 200.
 // ERR_TUNNEL_CONNECTION_FAILED will be returned for any other status.
 // In any of these cases, Read() may be called to retrieve the HTTP
@@ skipping 301 matching lines @@
   next_state_ = STATE_OPEN;
   if (net_log_.IsLoggingAllEvents()) {
     net_log_.AddEvent(
         NetLog::TYPE_HTTP_TRANSACTION_READ_TUNNEL_RESPONSE_HEADERS,
         make_scoped_refptr(new NetLogHttpResponseParameter(response_.headers)));
   }
 
   if (response_.headers->response_code() == 200) {
     return OK;
   } else if (response_.headers->response_code() == 407) {
-    return ERR_TUNNEL_CONNECTION_FAILED;
+    int rv =

[cbentzel, 2011/11/14 22:11:53]

Is there any way to share this with HttpProxyClientSocket::HandleAuthChallenge?
Or at least move it into a similar helper method.

[Ryan Hamilton, 2011/11/14 23:53:40]

Done.  I added a new HandleAuthChallenge method to HttpProxyUtils.

+        auth_->HandleAuthChallenge(response_.headers, false, true, net_log_);

[cbentzel, 2011/11/14 22:11:53]

Nit: maybe easier to read as 

int rv = auth_->HandleAuthChallenge(
  response_.headers)

[Ryan Hamilton, 2011/11/14 23:53:40]

Done.  (Heh, and then I moved the code, and it now fits on one line.)

+    response_.auth_challenge = auth_->auth_info();
+    if (rv == OK)
+      return ERR_PROXY_AUTH_REQUESTED;
+
+    return rv;
   } else {
     // Immediately hand off our SpdyStream to a newly created SpdyHttpStream
     // so that any subsequent SpdyFrames are processed in the context of
     // the HttpStream, not the socket.
     DCHECK(spdy_stream_);
     SpdyStream* stream = spdy_stream_;
     spdy_stream_ = NULL;
     response_stream_.reset(new SpdyHttpStream(NULL, false));
     response_stream_->InitializeWithExistingStream(stream);
     next_state_ = STATE_DISCONNECTED;
@@ skipping 112 matching lines @@
     OnDataReceived(NULL, 0);
   }
   if (write_callback)
     write_callback->Run(ERR_CONNECTION_CLOSED);
 }
 
 void SpdyProxyClientSocket::set_chunk_callback(ChunkCallback* /*callback*/) {
 }
 
 }  // namespace net