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

net/http/http_auth_handler_digest_unittest.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 <string>
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/http/http_auth_challenge_tokenizer.h"
 #include "net/http/http_auth_handler_digest.h"
 #include "net/http/http_request_info.h"
+#include "net/http/http_response_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 const char* const kSimpleChallenge =
   "Digest realm=\"Oblivion\", nonce=\"nonce-value\"";
 
 // RespondToChallenge creates an HttpAuthHandlerDigest for the specified
@@ skipping 24 matching lines @@
       new HttpAuthHandlerDigest::Factory());
   HttpAuthHandlerDigest::NonceGenerator* nonce_generator =
       new HttpAuthHandlerDigest::FixedNonceGenerator("client_nonce");
   factory->set_nonce_generator(nonce_generator);
 
   // Create a handler for a particular challenge.
   GURL url_origin(target == HttpAuth::AUTH_SERVER ? request_url : proxy_name);
   HttpAuthChallengeTokenizer tokenizer(challenge.begin(), challenge.end());
   scoped_ptr<HttpAuthHandler> handler =
       factory->CreateAuthHandlerForScheme(tokenizer.NormalizedScheme());
-  int rv = handler->HandleInitialChallenge(
-      tokenizer, target, url_origin.GetOrigin(), BoundNetLog());
+  HttpResponseInfo response_info;
+  TestCompletionCallback callback;
+  int rv = handler->HandleInitialChallenge(tokenizer, response_info, target,
+                                           url_origin.GetOrigin(),
+                                           BoundNetLog(), callback.callback());
+  rv = callback.GetResult(rv);
   if (rv != OK || handler.get() == NULL) {
     ADD_FAILURE() << "Unable to create auth handler.";
     return false;
   }
 
   // Create a token in response to the challenge.
   // NOTE: HttpAuthHandlerDigest's implementation of GenerateAuthToken always
   // completes synchronously. That's why this test can get away with a
   // TestCompletionCallback without an IO thread.
-  TestCompletionCallback callback;
   scoped_ptr<HttpRequestInfo> request(new HttpRequestInfo());
   request->url = GURL(request_url);
   AuthCredentials credentials(base::ASCIIToUTF16("foo"),
                               base::ASCIIToUTF16("bar"));
   rv = handler->GenerateAuthToken(&credentials, *request, callback.callback(),
                                   token);
   if (rv != OK) {
     ADD_FAILURE() << "Problems generating auth token";
     return false;
   }
 
   return true;
 }
 
 }  // namespace
 
 TEST(HttpAuthHandlerDigestTest, CreateAuthHandlerForScheme) {
   HttpAuthHandlerDigest::Factory digest_factory;
 
   EXPECT_TRUE(digest_factory.CreateAuthHandlerForScheme("digest"));
   EXPECT_FALSE(digest_factory.CreateAuthHandlerForScheme("bogus"));
 }
 
 TEST(HttpAuthHandlerDigestTest, CreateAndInitPreemptiveAuthHandler_Valid) {
   HttpAuthHandlerDigest::Factory digest_factory;
   HttpAuthCache auth_cache;
   std::string challenge(kSimpleChallenge);
-  HttpAuthChallengeTokenizer tokenizer(challenge.begin(), challenge.end());
 
   HttpAuthCache::Entry* entry =
       auth_cache.Add(GURL("http://example.com/foo").GetOrigin(), "foo",
                      "digest", challenge, AuthCredentials(), "/foo");
   EXPECT_TRUE(digest_factory.CreateAndInitPreemptiveAuthHandler(
-      entry, tokenizer, HttpAuth::AUTH_SERVER, BoundNetLog()));
+      entry, HttpAuth::AUTH_SERVER, BoundNetLog()));
 }
 
 TEST(HttpAuthHandlerDigestTest, CreateAndInitPreemptiveAuthHandler_Invalid) {
   HttpAuthHandlerDigest::Factory digest_factory;
   HttpAuthCache auth_cache;
   std::string challenge("Basic realm=\"bar\"");
-  HttpAuthChallengeTokenizer tokenizer(challenge.begin(), challenge.end());
 
   HttpAuthCache::Entry* entry =
       auth_cache.Add(GURL("http://example.com").GetOrigin(), "bar", "basic",
                      challenge, AuthCredentials(), "/bar");
   EXPECT_FALSE(digest_factory.CreateAndInitPreemptiveAuthHandler(
-      entry, tokenizer, HttpAuth::AUTH_SERVER, BoundNetLog()));
+      entry, HttpAuth::AUTH_SERVER, BoundNetLog()));
 }
 
 TEST(HttpAuthHandlerDigestTest, ParseChallenge) {
   static const struct {
     // The challenge string.
     const char* challenge;
     // Expected return value of ParseChallenge.
     bool parsed_success;
     // The expected values that were parsed.
     const char* parsed_realm;
@@ skipping 244 matching lines @@
 
   GURL origin("http://www.example.com");
   scoped_ptr<HttpAuthHandlerDigest::Factory> factory(
       new HttpAuthHandlerDigest::Factory());
   for (size_t i = 0; i < arraysize(tests); ++i) {
     std::string challenge = tests[i].challenge;
     HttpAuthChallengeTokenizer tokenizer(challenge.begin(), challenge.end());
     scoped_ptr<HttpAuthHandler> handler =
         factory->CreateAuthHandlerForScheme(tokenizer.NormalizedScheme());
     ASSERT_TRUE(handler);
-    int rv = handler->HandleInitialChallenge(tokenizer, HttpAuth::AUTH_SERVER,
-                                             origin, BoundNetLog());
+    HttpResponseInfo response_info;
+    TestCompletionCallback callback;
+    int rv = handler->HandleInitialChallenge(
+        tokenizer, response_info, HttpAuth::AUTH_SERVER, origin, BoundNetLog(),
+        callback.callback());
+    rv = callback.GetResult(rv);
     if (tests[i].parsed_success) {
       EXPECT_EQ(OK, rv);
     } else {
       EXPECT_NE(OK, rv);
       continue;
     }
     HttpAuthHandlerDigest* digest =
         static_cast<HttpAuthHandlerDigest*>(handler.get());
     EXPECT_STREQ(tests[i].parsed_realm, digest->realm_.c_str());
     EXPECT_STREQ(tests[i].parsed_nonce, digest->nonce_.c_str());
@@ skipping 139 matching lines @@
     }
   };
   GURL origin("http://www.example.com");
   scoped_ptr<HttpAuthHandlerDigest::Factory> factory(
       new HttpAuthHandlerDigest::Factory());
   for (size_t i = 0; i < arraysize(tests); ++i) {
     scoped_ptr<HttpAuthHandler> handler =
         factory->CreateAuthHandlerForScheme("digest");
     std::string challenge = tests[i].challenge;
     HttpAuthChallengeTokenizer tokenizer(challenge.begin(), challenge.end());
-    int rv = handler->HandleInitialChallenge(tokenizer, HttpAuth::AUTH_SERVER,
-                                             origin, BoundNetLog());
-    EXPECT_EQ(OK, rv);
+    HttpResponseInfo response_info;
+    TestCompletionCallback callback;
+    int rv = handler->HandleInitialChallenge(
+        tokenizer, response_info, HttpAuth::AUTH_SERVER, origin, BoundNetLog(),
+        callback.callback());
+    EXPECT_EQ(OK, callback.GetResult(rv));
 
     HttpAuthHandlerDigest* digest =
         static_cast<HttpAuthHandlerDigest*>(handler.get());
     std::string creds =
         digest->AssembleCredentials(tests[i].req_method,
                                     tests[i].req_path,
                                     AuthCredentials(
                                         base::ASCIIToUTF16(tests[i].username),
                                         base::ASCIIToUTF16(tests[i].password)),
                                     tests[i].cnonce,
                                     tests[i].nonce_count);
 
     EXPECT_STREQ(tests[i].expected_creds, creds.c_str());
   }
 }
 
 TEST(HttpAuthHandlerDigest, HandleAnotherChallenge) {
   scoped_ptr<HttpAuthHandlerDigest::Factory> factory(
       new HttpAuthHandlerDigest::Factory());
   std::string default_challenge =
       "Digest realm=\"Oblivion\", nonce=\"nonce-value\"";
   HttpAuthChallengeTokenizer tok_default(default_challenge.begin(),
                                          default_challenge.end());
   GURL origin("intranet.google.com");
   scoped_ptr<HttpAuthHandler> handler =
       factory->CreateAuthHandlerForScheme(tok_default.NormalizedScheme());
-  EXPECT_EQ(OK, handler->HandleInitialChallenge(
-                    tok_default, HttpAuth::AUTH_SERVER, origin, BoundNetLog()));
+  HttpResponseInfo response_info;
+  TestCompletionCallback callback;
+  int rv = handler->HandleInitialChallenge(tok_default, response_info,
+                                           HttpAuth::AUTH_SERVER, origin,
+                                           BoundNetLog(), callback.callback());
+  EXPECT_EQ(OK, callback.GetResult(rv));
   ASSERT_TRUE(handler.get() != NULL);
   EXPECT_EQ(HttpAuth::AUTHORIZATION_RESULT_REJECT,
             handler->HandleAnotherChallenge(tok_default));
 
   std::string stale_challenge = default_challenge + ", stale=true";
   HttpAuthChallengeTokenizer tok_stale(stale_challenge.begin(),
                                        stale_challenge.end());
   EXPECT_EQ(HttpAuth::AUTHORIZATION_RESULT_STALE,
             handler->HandleAnotherChallenge(tok_stale));
 
@@ skipping 122 matching lines @@
   EXPECT_EQ("Digest username=\"foo\", realm=\"Oblivion\", "
             "nonce=\"nonce-value\", uri=\"/path/to/resource\", "
             "response=\"5b1459beda5cee30d6ff9e970a69c0ea\", "
             "opaque=\"opaque text\", "
             "qop=auth, nc=00000001, cnonce=\"client_nonce\"",
             auth_token);
 }
 
 
 } // namespace net