| Index: net/http/http_network_transaction_unittest.cc
|
| ===================================================================
|
| --- net/http/http_network_transaction_unittest.cc (revision 31823)
|
| +++ net/http/http_network_transaction_unittest.cc (working copy)
|
| @@ -877,15 +877,10 @@
|
| "Authorization: Basic Zm9vOmJhcg==\r\n\r\n"),
|
| };
|
|
|
| - // Respond with 5 kb of response body.
|
| - std::string large_body_string("Unauthorized");
|
| - large_body_string.append(5 * 1024, ' ');
|
| - large_body_string.append("\r\n");
|
| -
|
| MockRead data_reads1[] = {
|
| MockRead("HTTP/1.1 401 Unauthorized\r\n"),
|
| MockRead("WWW-Authenticate: Basic realm=\"MyRealm1\"\r\n"),
|
| - MockRead("Content-Length: 0\r\n\r\n"),
|
| + MockRead("Content-Length: 0\r\n\r\n"), // No response body.
|
|
|
| // Lastly, the server responds with the actual content.
|
| MockRead("HTTP/1.1 200 OK\r\n"),
|
| @@ -1010,6 +1005,95 @@
|
| }
|
|
|
| // Test the request-challenge-retry sequence for basic auth, over a keep-alive
|
| +// connection, but the server gets impatient and closes the connection.
|
| +TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveImpatientServer) {
|
| + SessionDependencies session_deps;
|
| + scoped_ptr<HttpTransaction> trans(
|
| + new HttpNetworkTransaction(CreateSession(&session_deps)));
|
| +
|
| + HttpRequestInfo request;
|
| + request.method = "GET";
|
| + request.url = GURL("http://www.google.com/");
|
| + request.load_flags = 0;
|
| +
|
| + MockWrite data_writes1[] = {
|
| + MockWrite("GET / HTTP/1.1\r\n"
|
| + "Host: www.google.com\r\n"
|
| + "Connection: keep-alive\r\n\r\n"),
|
| + // This simulates the seemingly successful write to a closed connection
|
| + // if the bug is not fixed.
|
| + MockWrite("GET / HTTP/1.1\r\n"
|
| + "Host: www.google.com\r\n"
|
| + "Connection: keep-alive\r\n"
|
| + "Authorization: Basic Zm9vOmJhcg==\r\n\r\n"),
|
| + };
|
| +
|
| + MockRead data_reads1[] = {
|
| + MockRead("HTTP/1.1 401 Unauthorized\r\n"),
|
| + MockRead("WWW-Authenticate: Basic realm=\"MyRealm1\"\r\n"),
|
| + MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
|
| + MockRead("Content-Length: 14\r\n\r\n"),
|
| + // Tell MockTCPClientSocket to simulate the server closing the connection.
|
| + MockRead(false, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
|
| + MockRead("Unauthorized\r\n"),
|
| + MockRead(false, OK), // The server closes the connection.
|
| + };
|
| +
|
| + // After calling trans->RestartWithAuth(), this is the request we should
|
| + // be issuing -- the final header line contains the credentials.
|
| + MockWrite data_writes2[] = {
|
| + MockWrite("GET / HTTP/1.1\r\n"
|
| + "Host: www.google.com\r\n"
|
| + "Connection: keep-alive\r\n"
|
| + "Authorization: Basic Zm9vOmJhcg==\r\n\r\n"),
|
| + };
|
| +
|
| + // Lastly, the server responds with the actual content.
|
| + MockRead data_reads2[] = {
|
| + MockRead("HTTP/1.1 200 OK\r\n"),
|
| + MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
|
| + MockRead("Content-Length: 100\r\n\r\n"),
|
| + MockRead(false, OK),
|
| + };
|
| +
|
| + StaticSocketDataProvider data1(data_reads1, data_writes1);
|
| + StaticSocketDataProvider data2(data_reads2, data_writes2);
|
| + session_deps.socket_factory.AddSocketDataProvider(&data1);
|
| + session_deps.socket_factory.AddSocketDataProvider(&data2);
|
| +
|
| + TestCompletionCallback callback1;
|
| +
|
| + int rv = trans->Start(&request, &callback1, NULL);
|
| + EXPECT_EQ(ERR_IO_PENDING, rv);
|
| +
|
| + rv = callback1.WaitForResult();
|
| + EXPECT_EQ(OK, rv);
|
| +
|
| + const HttpResponseInfo* response = trans->GetResponseInfo();
|
| + EXPECT_FALSE(response == NULL);
|
| +
|
| + // The password prompt info should have been set in response->auth_challenge.
|
| + EXPECT_FALSE(response->auth_challenge.get() == NULL);
|
| +
|
| + EXPECT_EQ(L"www.google.com:80", response->auth_challenge->host_and_port);
|
| + EXPECT_EQ(L"MyRealm1", response->auth_challenge->realm);
|
| + EXPECT_EQ(L"basic", response->auth_challenge->scheme);
|
| +
|
| + TestCompletionCallback callback2;
|
| +
|
| + rv = trans->RestartWithAuth(L"foo", L"bar", &callback2);
|
| + EXPECT_EQ(ERR_IO_PENDING, rv);
|
| +
|
| + rv = callback2.WaitForResult();
|
| + EXPECT_EQ(OK, rv);
|
| +
|
| + response = trans->GetResponseInfo();
|
| + ASSERT_FALSE(response == NULL);
|
| + EXPECT_TRUE(response->auth_challenge.get() == NULL);
|
| + EXPECT_EQ(100, response->headers->GetContentLength());
|
| +}
|
| +
|
| +// Test the request-challenge-retry sequence for basic auth, over a keep-alive
|
| // proxy connection, when setting up an SSL tunnel.
|
| TEST_F(HttpNetworkTransactionTest, BasicAuthProxyKeepAlive) {
|
| // Configure against proxy server "myproxy:70".
|
|
|