| Index: net/http/http_network_transaction_unittest.cc
|
| diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
|
| index 2feb044001d4f25851240319593098658758203f..12b5f253267dd8f698cd7a6751f0a36a9e935754 100644
|
| --- a/net/http/http_network_transaction_unittest.cc
|
| +++ b/net/http/http_network_transaction_unittest.cc
|
| @@ -11276,7 +11276,6 @@ TEST_F(HttpNetworkTransactionTest, GenerateAuthToken) {
|
| static const char kServer[] = "http://www.example.com";
|
| static const char kSecureServer[] = "https://www.example.com";
|
| static const char kProxy[] = "myproxy:70";
|
| - const int kAuthErr = ERR_INVALID_AUTH_CREDENTIALS;
|
|
|
| enum AuthTiming {
|
| AUTH_NONE,
|
| @@ -11393,170 +11392,484 @@ TEST_F(HttpNetworkTransactionTest, GenerateAuthToken) {
|
| int first_ssl_round;
|
| TestRound rounds[3];
|
| } test_configs[] = {
|
| - // Non-authenticating HTTP server with a direct connection.
|
| - { NULL, AUTH_NONE, OK, kServer, AUTH_NONE, OK, 1, kNoSSL,
|
| - { TestRound(kGet, kSuccess, OK)}},
|
| - // Authenticating HTTP server with a direct connection.
|
| - { NULL, AUTH_NONE, OK, kServer, AUTH_SYNC, OK, 2, kNoSSL,
|
| - { TestRound(kGet, kServerChallenge, OK),
|
| + // Non-authenticating HTTP server with a direct connection.
|
| + {NULL,
|
| + AUTH_NONE,
|
| + OK,
|
| + kServer,
|
| + AUTH_NONE,
|
| + OK,
|
| + 1,
|
| + kNoSSL,
|
| + {TestRound(kGet, kSuccess, OK)}},
|
| + // Authenticating HTTP server with a direct connection.
|
| + {NULL,
|
| + AUTH_NONE,
|
| + OK,
|
| + kServer,
|
| + AUTH_SYNC,
|
| + OK,
|
| + 2,
|
| + kNoSSL,
|
| + {TestRound(kGet, kServerChallenge, OK),
|
| TestRound(kGetAuth, kSuccess, OK)}},
|
| - { NULL, AUTH_NONE, OK, kServer, AUTH_SYNC, kAuthErr, 2, kNoSSL,
|
| - { TestRound(kGet, kServerChallenge, OK),
|
| - TestRound(kGetAuth, kFailure, kAuthErr)}},
|
| - { NULL, AUTH_NONE, OK, kServer, AUTH_ASYNC, OK, 2, kNoSSL,
|
| - { TestRound(kGet, kServerChallenge, OK),
|
| + {NULL,
|
| + AUTH_NONE,
|
| + OK,
|
| + kServer,
|
| + AUTH_SYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 2,
|
| + kNoSSL,
|
| + {TestRound(kGet, kServerChallenge, OK),
|
| + TestRound(kGetAuth, kFailure, ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + {NULL,
|
| + AUTH_NONE,
|
| + OK,
|
| + kServer,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + 2,
|
| + kNoSSL,
|
| + {TestRound(kGet, kServerChallenge, OK),
|
| TestRound(kGetAuth, kSuccess, OK)}},
|
| - { NULL, AUTH_NONE, OK, kServer, AUTH_ASYNC, kAuthErr, 2, kNoSSL,
|
| - { TestRound(kGet, kServerChallenge, OK),
|
| - TestRound(kGetAuth, kFailure, kAuthErr)}},
|
| - // Non-authenticating HTTP server through a non-authenticating proxy.
|
| - { kProxy, AUTH_NONE, OK, kServer, AUTH_NONE, OK, 1, kNoSSL,
|
| - { TestRound(kGetProxy, kSuccess, OK)}},
|
| - // Authenticating HTTP server through a non-authenticating proxy.
|
| - { kProxy, AUTH_NONE, OK, kServer, AUTH_SYNC, OK, 2, kNoSSL,
|
| - { TestRound(kGetProxy, kServerChallenge, OK),
|
| + {NULL,
|
| + AUTH_NONE,
|
| + OK,
|
| + kServer,
|
| + AUTH_ASYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 2,
|
| + kNoSSL,
|
| + {TestRound(kGet, kServerChallenge, OK),
|
| + TestRound(kGetAuth, kFailure, ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + // Non-authenticating HTTP server through a non-authenticating proxy.
|
| + {kProxy,
|
| + AUTH_NONE,
|
| + OK,
|
| + kServer,
|
| + AUTH_NONE,
|
| + OK,
|
| + 1,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kSuccess, OK)}},
|
| + // Authenticating HTTP server through a non-authenticating proxy.
|
| + {kProxy,
|
| + AUTH_NONE,
|
| + OK,
|
| + kServer,
|
| + AUTH_SYNC,
|
| + OK,
|
| + 2,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kServerChallenge, OK),
|
| TestRound(kGetAuthThroughProxy, kSuccess, OK)}},
|
| - { kProxy, AUTH_NONE, OK, kServer, AUTH_SYNC, kAuthErr, 2, kNoSSL,
|
| - { TestRound(kGetProxy, kServerChallenge, OK),
|
| - TestRound(kGetAuthThroughProxy, kFailure, kAuthErr)}},
|
| - { kProxy, AUTH_NONE, OK, kServer, AUTH_ASYNC, OK, 2, kNoSSL,
|
| - { TestRound(kGetProxy, kServerChallenge, OK),
|
| + {kProxy,
|
| + AUTH_NONE,
|
| + OK,
|
| + kServer,
|
| + AUTH_SYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 2,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kServerChallenge, OK),
|
| + TestRound(kGetAuthThroughProxy, kFailure,
|
| + ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + {kProxy,
|
| + AUTH_NONE,
|
| + OK,
|
| + kServer,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + 2,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kServerChallenge, OK),
|
| TestRound(kGetAuthThroughProxy, kSuccess, OK)}},
|
| - { kProxy, AUTH_NONE, OK, kServer, AUTH_ASYNC, kAuthErr, 2, kNoSSL,
|
| - { TestRound(kGetProxy, kServerChallenge, OK),
|
| - TestRound(kGetAuthThroughProxy, kFailure, kAuthErr)}},
|
| - // Non-authenticating HTTP server through an authenticating proxy.
|
| - { kProxy, AUTH_SYNC, OK, kServer, AUTH_NONE, OK, 2, kNoSSL,
|
| - { TestRound(kGetProxy, kProxyChallenge, OK),
|
| + {kProxy,
|
| + AUTH_NONE,
|
| + OK,
|
| + kServer,
|
| + AUTH_ASYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 2,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kServerChallenge, OK),
|
| + TestRound(kGetAuthThroughProxy, kFailure,
|
| + ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + // Non-authenticating HTTP server through an authenticating proxy.
|
| + {kProxy,
|
| + AUTH_SYNC,
|
| + OK,
|
| + kServer,
|
| + AUTH_NONE,
|
| + OK,
|
| + 2,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kProxyChallenge, OK),
|
| TestRound(kGetProxyAuth, kSuccess, OK)}},
|
| - { kProxy, AUTH_SYNC, kAuthErr, kServer, AUTH_NONE, OK, 2, kNoSSL,
|
| - { TestRound(kGetProxy, kProxyChallenge, OK),
|
| - TestRound(kGetProxyAuth, kFailure, kAuthErr)}},
|
| - { kProxy, AUTH_ASYNC, OK, kServer, AUTH_NONE, OK, 2, kNoSSL,
|
| - { TestRound(kGetProxy, kProxyChallenge, OK),
|
| + {kProxy,
|
| + AUTH_SYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + kServer,
|
| + AUTH_NONE,
|
| + OK,
|
| + 2,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kProxyChallenge, OK),
|
| + TestRound(kGetProxyAuth, kFailure, ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + {kProxy,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + kServer,
|
| + AUTH_NONE,
|
| + OK,
|
| + 2,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kProxyChallenge, OK),
|
| TestRound(kGetProxyAuth, kSuccess, OK)}},
|
| - { kProxy, AUTH_ASYNC, kAuthErr, kServer, AUTH_NONE, OK, 2, kNoSSL,
|
| - { TestRound(kGetProxy, kProxyChallenge, OK),
|
| - TestRound(kGetProxyAuth, kFailure, kAuthErr)}},
|
| - // Authenticating HTTP server through an authenticating proxy.
|
| - { kProxy, AUTH_SYNC, OK, kServer, AUTH_SYNC, OK, 3, kNoSSL,
|
| - { TestRound(kGetProxy, kProxyChallenge, OK),
|
| + {kProxy,
|
| + AUTH_ASYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + kServer,
|
| + AUTH_NONE,
|
| + OK,
|
| + 2,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kProxyChallenge, OK),
|
| + TestRound(kGetProxyAuth, kFailure, ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + // Authenticating HTTP server through an authenticating proxy.
|
| + {kProxy,
|
| + AUTH_SYNC,
|
| + OK,
|
| + kServer,
|
| + AUTH_SYNC,
|
| + OK,
|
| + 3,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kProxyChallenge, OK),
|
| TestRound(kGetProxyAuth, kServerChallenge, OK),
|
| TestRound(kGetAuthWithProxyAuth, kSuccess, OK)}},
|
| - { kProxy, AUTH_SYNC, OK, kServer, AUTH_SYNC, kAuthErr, 3, kNoSSL,
|
| - { TestRound(kGetProxy, kProxyChallenge, OK),
|
| + {kProxy,
|
| + AUTH_SYNC,
|
| + OK,
|
| + kServer,
|
| + AUTH_SYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 3,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kProxyChallenge, OK),
|
| TestRound(kGetProxyAuth, kServerChallenge, OK),
|
| - TestRound(kGetAuthWithProxyAuth, kFailure, kAuthErr)}},
|
| - { kProxy, AUTH_ASYNC, OK, kServer, AUTH_SYNC, OK, 3, kNoSSL,
|
| - { TestRound(kGetProxy, kProxyChallenge, OK),
|
| + TestRound(kGetAuthWithProxyAuth, kFailure,
|
| + ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + {kProxy,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + kServer,
|
| + AUTH_SYNC,
|
| + OK,
|
| + 3,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kProxyChallenge, OK),
|
| TestRound(kGetProxyAuth, kServerChallenge, OK),
|
| TestRound(kGetAuthWithProxyAuth, kSuccess, OK)}},
|
| - { kProxy, AUTH_ASYNC, OK, kServer, AUTH_SYNC, kAuthErr, 3, kNoSSL,
|
| - { TestRound(kGetProxy, kProxyChallenge, OK),
|
| + {kProxy,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + kServer,
|
| + AUTH_SYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 3,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kProxyChallenge, OK),
|
| TestRound(kGetProxyAuth, kServerChallenge, OK),
|
| - TestRound(kGetAuthWithProxyAuth, kFailure, kAuthErr)}},
|
| - { kProxy, AUTH_SYNC, OK, kServer, AUTH_ASYNC, OK, 3, kNoSSL,
|
| - { TestRound(kGetProxy, kProxyChallenge, OK),
|
| + TestRound(kGetAuthWithProxyAuth, kFailure,
|
| + ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + {kProxy,
|
| + AUTH_SYNC,
|
| + OK,
|
| + kServer,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + 3,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kProxyChallenge, OK),
|
| TestRound(kGetProxyAuth, kServerChallenge, OK),
|
| TestRound(kGetAuthWithProxyAuth, kSuccess, OK)}},
|
| - { kProxy, AUTH_SYNC, OK, kServer, AUTH_ASYNC, kAuthErr, 3, kNoSSL,
|
| - { TestRound(kGetProxy, kProxyChallenge, OK),
|
| + {kProxy,
|
| + AUTH_SYNC,
|
| + OK,
|
| + kServer,
|
| + AUTH_ASYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 3,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kProxyChallenge, OK),
|
| TestRound(kGetProxyAuth, kServerChallenge, OK),
|
| - TestRound(kGetAuthWithProxyAuth, kFailure, kAuthErr)}},
|
| - { kProxy, AUTH_ASYNC, OK, kServer, AUTH_ASYNC, OK, 3, kNoSSL,
|
| - { TestRound(kGetProxy, kProxyChallenge, OK),
|
| + TestRound(kGetAuthWithProxyAuth, kFailure,
|
| + ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + {kProxy,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + kServer,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + 3,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kProxyChallenge, OK),
|
| TestRound(kGetProxyAuth, kServerChallenge, OK),
|
| TestRound(kGetAuthWithProxyAuth, kSuccess, OK)}},
|
| - { kProxy, AUTH_ASYNC, OK, kServer, AUTH_ASYNC, kAuthErr, 3, kNoSSL,
|
| - { TestRound(kGetProxy, kProxyChallenge, OK),
|
| + {kProxy,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + kServer,
|
| + AUTH_ASYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 3,
|
| + kNoSSL,
|
| + {TestRound(kGetProxy, kProxyChallenge, OK),
|
| TestRound(kGetProxyAuth, kServerChallenge, OK),
|
| - TestRound(kGetAuthWithProxyAuth, kFailure, kAuthErr)}},
|
| - // Non-authenticating HTTPS server with a direct connection.
|
| - { NULL, AUTH_NONE, OK, kSecureServer, AUTH_NONE, OK, 1, 0,
|
| - { TestRound(kGet, kSuccess, OK)}},
|
| - // Authenticating HTTPS server with a direct connection.
|
| - { NULL, AUTH_NONE, OK, kSecureServer, AUTH_SYNC, OK, 2, 0,
|
| - { TestRound(kGet, kServerChallenge, OK),
|
| + TestRound(kGetAuthWithProxyAuth, kFailure,
|
| + ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + // Non-authenticating HTTPS server with a direct connection.
|
| + {NULL,
|
| + AUTH_NONE,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_NONE,
|
| + OK,
|
| + 1,
|
| + 0,
|
| + {TestRound(kGet, kSuccess, OK)}},
|
| + // Authenticating HTTPS server with a direct connection.
|
| + {NULL,
|
| + AUTH_NONE,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_SYNC,
|
| + OK,
|
| + 2,
|
| + 0,
|
| + {TestRound(kGet, kServerChallenge, OK),
|
| TestRound(kGetAuth, kSuccess, OK)}},
|
| - { NULL, AUTH_NONE, OK, kSecureServer, AUTH_SYNC, kAuthErr, 2, 0,
|
| - { TestRound(kGet, kServerChallenge, OK),
|
| - TestRound(kGetAuth, kFailure, kAuthErr)}},
|
| - { NULL, AUTH_NONE, OK, kSecureServer, AUTH_ASYNC, OK, 2, 0,
|
| - { TestRound(kGet, kServerChallenge, OK),
|
| + {NULL,
|
| + AUTH_NONE,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_SYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 2,
|
| + 0,
|
| + {TestRound(kGet, kServerChallenge, OK),
|
| + TestRound(kGetAuth, kFailure, ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + {NULL,
|
| + AUTH_NONE,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + 2,
|
| + 0,
|
| + {TestRound(kGet, kServerChallenge, OK),
|
| TestRound(kGetAuth, kSuccess, OK)}},
|
| - { NULL, AUTH_NONE, OK, kSecureServer, AUTH_ASYNC, kAuthErr, 2, 0,
|
| - { TestRound(kGet, kServerChallenge, OK),
|
| - TestRound(kGetAuth, kFailure, kAuthErr)}},
|
| - // Non-authenticating HTTPS server with a non-authenticating proxy.
|
| - { kProxy, AUTH_NONE, OK, kSecureServer, AUTH_NONE, OK, 1, 0,
|
| - { TestRound(kConnect, kProxyConnected, OK, &kGet, &kSuccess)}},
|
| - // Authenticating HTTPS server through a non-authenticating proxy.
|
| - { kProxy, AUTH_NONE, OK, kSecureServer, AUTH_SYNC, OK, 2, 0,
|
| - { TestRound(kConnect, kProxyConnected, OK, &kGet, &kServerChallenge),
|
| + {NULL,
|
| + AUTH_NONE,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_ASYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 2,
|
| + 0,
|
| + {TestRound(kGet, kServerChallenge, OK),
|
| + TestRound(kGetAuth, kFailure, ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + // Non-authenticating HTTPS server with a non-authenticating proxy.
|
| + {kProxy,
|
| + AUTH_NONE,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_NONE,
|
| + OK,
|
| + 1,
|
| + 0,
|
| + {TestRound(kConnect, kProxyConnected, OK, &kGet, &kSuccess)}},
|
| + // Authenticating HTTPS server through a non-authenticating proxy.
|
| + {kProxy,
|
| + AUTH_NONE,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_SYNC,
|
| + OK,
|
| + 2,
|
| + 0,
|
| + {TestRound(kConnect, kProxyConnected, OK, &kGet, &kServerChallenge),
|
| TestRound(kGetAuth, kSuccess, OK)}},
|
| - { kProxy, AUTH_NONE, OK, kSecureServer, AUTH_SYNC, kAuthErr, 2, 0,
|
| - { TestRound(kConnect, kProxyConnected, OK, &kGet, &kServerChallenge),
|
| - TestRound(kGetAuth, kFailure, kAuthErr)}},
|
| - { kProxy, AUTH_NONE, OK, kSecureServer, AUTH_ASYNC, OK, 2, 0,
|
| - { TestRound(kConnect, kProxyConnected, OK, &kGet, &kServerChallenge),
|
| + {kProxy,
|
| + AUTH_NONE,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_SYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 2,
|
| + 0,
|
| + {TestRound(kConnect, kProxyConnected, OK, &kGet, &kServerChallenge),
|
| + TestRound(kGetAuth, kFailure, ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + {kProxy,
|
| + AUTH_NONE,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + 2,
|
| + 0,
|
| + {TestRound(kConnect, kProxyConnected, OK, &kGet, &kServerChallenge),
|
| TestRound(kGetAuth, kSuccess, OK)}},
|
| - { kProxy, AUTH_NONE, OK, kSecureServer, AUTH_ASYNC, kAuthErr, 2, 0,
|
| - { TestRound(kConnect, kProxyConnected, OK, &kGet, &kServerChallenge),
|
| - TestRound(kGetAuth, kFailure, kAuthErr)}},
|
| - // Non-Authenticating HTTPS server through an authenticating proxy.
|
| - { kProxy, AUTH_SYNC, OK, kSecureServer, AUTH_NONE, OK, 2, 1,
|
| - { TestRound(kConnect, kProxyChallenge, OK),
|
| + {kProxy,
|
| + AUTH_NONE,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_ASYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 2,
|
| + 0,
|
| + {TestRound(kConnect, kProxyConnected, OK, &kGet, &kServerChallenge),
|
| + TestRound(kGetAuth, kFailure, ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + // Non-Authenticating HTTPS server through an authenticating proxy.
|
| + {kProxy,
|
| + AUTH_SYNC,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_NONE,
|
| + OK,
|
| + 2,
|
| + 1,
|
| + {TestRound(kConnect, kProxyChallenge, OK),
|
| TestRound(kConnectProxyAuth, kProxyConnected, OK, &kGet, &kSuccess)}},
|
| - { kProxy, AUTH_SYNC, kAuthErr, kSecureServer, AUTH_NONE, OK, 2, kNoSSL,
|
| - { TestRound(kConnect, kProxyChallenge, OK),
|
| - TestRound(kConnectProxyAuth, kFailure, kAuthErr)}},
|
| - { kProxy, AUTH_ASYNC, OK, kSecureServer, AUTH_NONE, OK, 2, 1,
|
| - { TestRound(kConnect, kProxyChallenge, OK),
|
| + {kProxy,
|
| + AUTH_SYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + kSecureServer,
|
| + AUTH_NONE,
|
| + OK,
|
| + 2,
|
| + kNoSSL,
|
| + {TestRound(kConnect, kProxyChallenge, OK),
|
| + TestRound(kConnectProxyAuth, kFailure, ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + {kProxy,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_NONE,
|
| + OK,
|
| + 2,
|
| + 1,
|
| + {TestRound(kConnect, kProxyChallenge, OK),
|
| TestRound(kConnectProxyAuth, kProxyConnected, OK, &kGet, &kSuccess)}},
|
| - { kProxy, AUTH_ASYNC, kAuthErr, kSecureServer, AUTH_NONE, OK, 2, kNoSSL,
|
| - { TestRound(kConnect, kProxyChallenge, OK),
|
| - TestRound(kConnectProxyAuth, kFailure, kAuthErr)}},
|
| - // Authenticating HTTPS server through an authenticating proxy.
|
| - { kProxy, AUTH_SYNC, OK, kSecureServer, AUTH_SYNC, OK, 3, 1,
|
| - { TestRound(kConnect, kProxyChallenge, OK),
|
| - TestRound(kConnectProxyAuth, kProxyConnected, OK,
|
| - &kGet, &kServerChallenge),
|
| + {kProxy,
|
| + AUTH_ASYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + kSecureServer,
|
| + AUTH_NONE,
|
| + OK,
|
| + 2,
|
| + kNoSSL,
|
| + {TestRound(kConnect, kProxyChallenge, OK),
|
| + TestRound(kConnectProxyAuth, kFailure, ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + // Authenticating HTTPS server through an authenticating proxy.
|
| + {kProxy,
|
| + AUTH_SYNC,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_SYNC,
|
| + OK,
|
| + 3,
|
| + 1,
|
| + {TestRound(kConnect, kProxyChallenge, OK),
|
| + TestRound(kConnectProxyAuth, kProxyConnected, OK, &kGet,
|
| + &kServerChallenge),
|
| TestRound(kGetAuth, kSuccess, OK)}},
|
| - { kProxy, AUTH_SYNC, OK, kSecureServer, AUTH_SYNC, kAuthErr, 3, 1,
|
| - { TestRound(kConnect, kProxyChallenge, OK),
|
| - TestRound(kConnectProxyAuth, kProxyConnected, OK,
|
| - &kGet, &kServerChallenge),
|
| - TestRound(kGetAuth, kFailure, kAuthErr)}},
|
| - { kProxy, AUTH_ASYNC, OK, kSecureServer, AUTH_SYNC, OK, 3, 1,
|
| - { TestRound(kConnect, kProxyChallenge, OK),
|
| - TestRound(kConnectProxyAuth, kProxyConnected, OK,
|
| - &kGet, &kServerChallenge),
|
| + {kProxy,
|
| + AUTH_SYNC,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_SYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 3,
|
| + 1,
|
| + {TestRound(kConnect, kProxyChallenge, OK),
|
| + TestRound(kConnectProxyAuth, kProxyConnected, OK, &kGet,
|
| + &kServerChallenge),
|
| + TestRound(kGetAuth, kFailure, ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + {kProxy,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_SYNC,
|
| + OK,
|
| + 3,
|
| + 1,
|
| + {TestRound(kConnect, kProxyChallenge, OK),
|
| + TestRound(kConnectProxyAuth, kProxyConnected, OK, &kGet,
|
| + &kServerChallenge),
|
| TestRound(kGetAuth, kSuccess, OK)}},
|
| - { kProxy, AUTH_ASYNC, OK, kSecureServer, AUTH_SYNC, kAuthErr, 3, 1,
|
| - { TestRound(kConnect, kProxyChallenge, OK),
|
| - TestRound(kConnectProxyAuth, kProxyConnected, OK,
|
| - &kGet, &kServerChallenge),
|
| - TestRound(kGetAuth, kFailure, kAuthErr)}},
|
| - { kProxy, AUTH_SYNC, OK, kSecureServer, AUTH_ASYNC, OK, 3, 1,
|
| - { TestRound(kConnect, kProxyChallenge, OK),
|
| - TestRound(kConnectProxyAuth, kProxyConnected, OK,
|
| - &kGet, &kServerChallenge),
|
| + {kProxy,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_SYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 3,
|
| + 1,
|
| + {TestRound(kConnect, kProxyChallenge, OK),
|
| + TestRound(kConnectProxyAuth, kProxyConnected, OK, &kGet,
|
| + &kServerChallenge),
|
| + TestRound(kGetAuth, kFailure, ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + {kProxy,
|
| + AUTH_SYNC,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + 3,
|
| + 1,
|
| + {TestRound(kConnect, kProxyChallenge, OK),
|
| + TestRound(kConnectProxyAuth, kProxyConnected, OK, &kGet,
|
| + &kServerChallenge),
|
| TestRound(kGetAuth, kSuccess, OK)}},
|
| - { kProxy, AUTH_SYNC, OK, kSecureServer, AUTH_ASYNC, kAuthErr, 3, 1,
|
| - { TestRound(kConnect, kProxyChallenge, OK),
|
| - TestRound(kConnectProxyAuth, kProxyConnected, OK,
|
| - &kGet, &kServerChallenge),
|
| - TestRound(kGetAuth, kFailure, kAuthErr)}},
|
| - { kProxy, AUTH_ASYNC, OK, kSecureServer, AUTH_ASYNC, OK, 3, 1,
|
| - { TestRound(kConnect, kProxyChallenge, OK),
|
| - TestRound(kConnectProxyAuth, kProxyConnected, OK,
|
| - &kGet, &kServerChallenge),
|
| + {kProxy,
|
| + AUTH_SYNC,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_ASYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 3,
|
| + 1,
|
| + {TestRound(kConnect, kProxyChallenge, OK),
|
| + TestRound(kConnectProxyAuth, kProxyConnected, OK, &kGet,
|
| + &kServerChallenge),
|
| + TestRound(kGetAuth, kFailure, ERR_INVALID_AUTH_CREDENTIALS)}},
|
| + {kProxy,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + 3,
|
| + 1,
|
| + {TestRound(kConnect, kProxyChallenge, OK),
|
| + TestRound(kConnectProxyAuth, kProxyConnected, OK, &kGet,
|
| + &kServerChallenge),
|
| TestRound(kGetAuth, kSuccess, OK)}},
|
| - { kProxy, AUTH_ASYNC, OK, kSecureServer, AUTH_ASYNC, kAuthErr, 3, 1,
|
| - { TestRound(kConnect, kProxyChallenge, OK),
|
| - TestRound(kConnectProxyAuth, kProxyConnected, OK,
|
| - &kGet, &kServerChallenge),
|
| - TestRound(kGetAuth, kFailure, kAuthErr)}},
|
| + {kProxy,
|
| + AUTH_ASYNC,
|
| + OK,
|
| + kSecureServer,
|
| + AUTH_ASYNC,
|
| + ERR_INVALID_AUTH_CREDENTIALS,
|
| + 3,
|
| + 1,
|
| + {TestRound(kConnect, kProxyChallenge, OK),
|
| + TestRound(kConnectProxyAuth, kProxyConnected, OK, &kGet,
|
| + &kServerChallenge),
|
| + TestRound(kGetAuth, kFailure, ERR_INVALID_AUTH_CREDENTIALS)}},
|
| };
|
|
|
| for (size_t i = 0; i < arraysize(test_configs); ++i) {
|
|
|