[net/http auth] Make HttpAuthHandler challenge handling asynchronous.

net/spdy/spdy_proxy_client_socket.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 305 matching lines @@
           // HttpProxyClientSocket.
           net_log_.BeginEvent(
               NetLog::TYPE_HTTP_TRANSACTION_TUNNEL_READ_HEADERS);
         }
         break;
       case STATE_READ_REPLY_COMPLETE:
         rv = DoReadReplyComplete(rv);
         net_log_.EndEventWithNetErrorCode(
             NetLog::TYPE_HTTP_TRANSACTION_TUNNEL_READ_HEADERS, rv);
         break;
+      case STATE_HANDLE_PROXY_AUTH_CHALLENGE:
+        rv = DoHandleProxyAuthChallenge();
+        break;
+      case STATE_HANDLE_PROXY_AUTH_CHALLENGE_COMPLETE:
+        rv = DoHandleProxyAuthChallengeComplete(rv);
+        break;
       default:
         NOTREACHED() << "bad state";
         rv = ERR_UNEXPECTED;
         break;
     }
   } while (rv != ERR_IO_PENDING && next_state_ != STATE_DISCONNECTED &&
            next_state_ != STATE_OPEN);
   return rv;
 }
 
@@ skipping 77 matching lines @@
       }
 
       redirect_has_load_timing_info_ =
           spdy_stream_->GetLoadTimingInfo(&redirect_load_timing_info_);
       // Note that this triggers a RST_STREAM_CANCEL.
       spdy_stream_->DetachDelegate();
       next_state_ = STATE_DISCONNECTED;
       return ERR_HTTPS_PROXY_TUNNEL_RESPONSE;
 
     case 407:  // Proxy Authentication Required
-      next_state_ = STATE_OPEN;
-      if (!SanitizeProxyAuth(&response_)) {
-        LogBlockedTunnelResponse();
-        return ERR_TUNNEL_CONNECTION_FAILED;
-      }
-      return HandleProxyAuthChallenge(auth_.get(), &response_, net_log_);
+      next_state_ = STATE_HANDLE_PROXY_AUTH_CHALLENGE;
+      return OK;
 
     default:
       // Ignore response to avoid letting the proxy impersonate the target
       // server.  (See http://crbug.com/137891.)
       LogBlockedTunnelResponse();
       return ERR_TUNNEL_CONNECTION_FAILED;
   }
 }
 
+int SpdyProxyClientSocket::DoHandleProxyAuthChallenge() {
+  if (!SanitizeProxyAuth(&response_)) {
+    LogBlockedTunnelResponse();
+    return ERR_TUNNEL_CONNECTION_FAILED;
+  }
+  next_state_ = STATE_HANDLE_PROXY_AUTH_CHALLENGE_COMPLETE;
+  return auth_->HandleAuthChallenge(
+      response_, base::Bind(&SpdyProxyClientSocket::OnIOComplete,
+                            weak_factory_.GetWeakPtr()),
+      net_log_);
+}
+
+int SpdyProxyClientSocket::DoHandleProxyAuthChallengeComplete(int result) {
+  next_state_ = STATE_OPEN;
+  if (result != OK)
+    return result;
+  if (auth_->HaveAuthHandler()) {
+    response_.auth_challenge = auth_->auth_info();
+    return ERR_PROXY_AUTH_REQUESTED;
+  }
+  return ERR_PROXY_AUTH_UNSUPPORTED;
+}
+
 // SpdyStream::Delegate methods:
 // Called when SYN frame has been sent.
 // Returns true if no more data to be sent after SYN frame.
 void SpdyProxyClientSocket::OnRequestHeadersSent() {
   DCHECK_EQ(next_state_, STATE_SEND_REQUEST_COMPLETE);
 
   OnIOComplete(OK);
 }
 
 SpdyResponseHeadersStatus SpdyProxyClientSocket::OnResponseHeadersUpdated(
@@ skipping 80 matching lines @@
   } else if (!read_callback_.is_null()) {
     // If we have a read_callback_, the we need to make sure we call it back.
     OnDataReceived(scoped_ptr<SpdyBuffer>());
   }
   // This may have been deleted by read_callback_, so check first.
   if (weak_ptr.get() && !write_callback.is_null())
     write_callback.Run(ERR_CONNECTION_CLOSED);
 }
 
 }  // namespace net