Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_auth_handler_factory_unittest.cc

Issue 1408433006: Support tls-server-end-point channel bindings for HTTP authentication. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Narrower dependencies, update comments, address review comments. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/cert/x509_util_openssl.cc ('K') | « net/http/http_auth_handler_factory.cc ('k') | net/http/http_auth_handler_mock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_auth_handler_factory_unittest.cc
diff --git a/net/http/http_auth_handler_factory_unittest.cc b/net/http/http_auth_handler_factory_unittest.cc
index b73e47b8961ef38af0847762359412b41a7132c1..6d851211670e28a68257d30b9af1303ae4500f84 100644
--- a/net/http/http_auth_handler_factory_unittest.cc
+++ b/net/http/http_auth_handler_factory_unittest.cc
@@ -10,6 +10,7 @@
#include "net/http/http_auth_scheme.h"
#include "net/http/mock_allow_http_auth_preferences.h"
#include "net/http/url_security_manager.h"
+#include "net/ssl/ssl_info.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace net {
@@ -24,6 +25,7 @@ class MockHttpAuthHandlerFactory : public HttpAuthHandlerFactory {
int CreateAuthHandler(HttpAuthChallengeTokenizer* challenge,
HttpAuth::Target target,
+ const SSLInfo& ssl_info,
const GURL& origin,
CreateReason reason,
int nonce_count,
@@ -40,6 +42,7 @@ class MockHttpAuthHandlerFactory : public HttpAuthHandlerFactory {
} // namespace
TEST(HttpAuthHandlerFactoryTest, RegistryFactory) {
+ SSLInfo null_ssl_info;
HttpAuthHandlerRegistryFactory registry_factory;
GURL gurl("www.google.com");
const int kBasicReturnCode = ERR_INVALID_SPDY_STREAM;
@@ -59,42 +62,43 @@ TEST(HttpAuthHandlerFactoryTest, RegistryFactory) {
// No schemes should be supported in the beginning.
EXPECT_EQ(ERR_UNSUPPORTED_AUTH_SCHEME,
registry_factory.CreateAuthHandlerFromString(
- "Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
+ "Basic", HttpAuth::AUTH_SERVER, null_ssl_info, gurl,
+ BoundNetLog(), &handler));
// Test what happens with a single scheme.
registry_factory.RegisterSchemeFactory("Basic", mock_factory_basic);
- EXPECT_EQ(kBasicReturnCode,
- registry_factory.CreateAuthHandlerFromString(
- "Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
+ EXPECT_EQ(kBasicReturnCode, registry_factory.CreateAuthHandlerFromString(
+ "Basic", HttpAuth::AUTH_SERVER, null_ssl_info,
+ gurl, BoundNetLog(), &handler));
EXPECT_EQ(ERR_UNSUPPORTED_AUTH_SCHEME,
registry_factory.CreateAuthHandlerFromString(
- "Digest", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(),
- &handler));
+ "Digest", HttpAuth::AUTH_SERVER, null_ssl_info, gurl,
+ BoundNetLog(), &handler));
// Test multiple schemes
registry_factory.RegisterSchemeFactory("Digest", mock_factory_digest);
- EXPECT_EQ(kBasicReturnCode,
- registry_factory.CreateAuthHandlerFromString(
- "Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
+ EXPECT_EQ(kBasicReturnCode, registry_factory.CreateAuthHandlerFromString(
+ "Basic", HttpAuth::AUTH_SERVER, null_ssl_info,
+ gurl, BoundNetLog(), &handler));
EXPECT_EQ(kDigestReturnCode,
registry_factory.CreateAuthHandlerFromString(
- "Digest", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(),
- &handler));
+ "Digest", HttpAuth::AUTH_SERVER, null_ssl_info, gurl,
+ BoundNetLog(), &handler));
// Test case-insensitivity
- EXPECT_EQ(kBasicReturnCode,
- registry_factory.CreateAuthHandlerFromString(
- "basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
+ EXPECT_EQ(kBasicReturnCode, registry_factory.CreateAuthHandlerFromString(
+ "basic", HttpAuth::AUTH_SERVER, null_ssl_info,
+ gurl, BoundNetLog(), &handler));
// Test replacement of existing auth scheme
registry_factory.RegisterSchemeFactory("Digest", mock_factory_digest_replace);
- EXPECT_EQ(kBasicReturnCode,
- registry_factory.CreateAuthHandlerFromString(
- "Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
+ EXPECT_EQ(kBasicReturnCode, registry_factory.CreateAuthHandlerFromString(
+ "Basic", HttpAuth::AUTH_SERVER, null_ssl_info,
+ gurl, BoundNetLog(), &handler));
EXPECT_EQ(kDigestReturnCodeReplace,
registry_factory.CreateAuthHandlerFromString(
- "Digest", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(),
- &handler));
+ "Digest", HttpAuth::AUTH_SERVER, null_ssl_info, gurl,
+ BoundNetLog(), &handler));
}
TEST(HttpAuthHandlerFactoryTest, DefaultFactory) {
@@ -106,14 +110,12 @@ TEST(HttpAuthHandlerFactoryTest, DefaultFactory) {
&http_auth_preferences);
GURL server_origin("http://www.example.com");
GURL proxy_origin("http://cache.example.com:3128");
+ SSLInfo null_ssl_info;
{
scoped_ptr<HttpAuthHandler> handler;
int rv = http_auth_handler_factory->CreateAuthHandlerFromString(
- "Basic realm=\"FooBar\"",
- HttpAuth::AUTH_SERVER,
- server_origin,
- BoundNetLog(),
- &handler);
+ "Basic realm=\"FooBar\"", HttpAuth::AUTH_SERVER, null_ssl_info,
+ server_origin, BoundNetLog(), &handler);
EXPECT_EQ(OK, rv);
ASSERT_FALSE(handler.get() == NULL);
EXPECT_EQ(HttpAuth::AUTH_SCHEME_BASIC, handler->auth_scheme());
@@ -125,22 +127,16 @@ TEST(HttpAuthHandlerFactoryTest, DefaultFactory) {
{
scoped_ptr<HttpAuthHandler> handler;
int rv = http_auth_handler_factory->CreateAuthHandlerFromString(
- "UNSUPPORTED realm=\"FooBar\"",
- HttpAuth::AUTH_SERVER,
- server_origin,
- BoundNetLog(),
- &handler);
+ "UNSUPPORTED realm=\"FooBar\"", HttpAuth::AUTH_SERVER, null_ssl_info,
+ server_origin, BoundNetLog(), &handler);
EXPECT_EQ(ERR_UNSUPPORTED_AUTH_SCHEME, rv);
EXPECT_TRUE(handler.get() == NULL);
}
{
scoped_ptr<HttpAuthHandler> handler;
int rv = http_auth_handler_factory->CreateAuthHandlerFromString(
- "Digest realm=\"FooBar\", nonce=\"xyz\"",
- HttpAuth::AUTH_PROXY,
- proxy_origin,
- BoundNetLog(),
- &handler);
+ "Digest realm=\"FooBar\", nonce=\"xyz\"", HttpAuth::AUTH_PROXY,
+ null_ssl_info, proxy_origin, BoundNetLog(), &handler);
EXPECT_EQ(OK, rv);
ASSERT_FALSE(handler.get() == NULL);
EXPECT_EQ(HttpAuth::AUTH_SCHEME_DIGEST, handler->auth_scheme());
@@ -152,11 +148,8 @@ TEST(HttpAuthHandlerFactoryTest, DefaultFactory) {
{
scoped_ptr<HttpAuthHandler> handler;
int rv = http_auth_handler_factory->CreateAuthHandlerFromString(
- "NTLM",
- HttpAuth::AUTH_SERVER,
- server_origin,
- BoundNetLog(),
- &handler);
+ "NTLM", HttpAuth::AUTH_SERVER, null_ssl_info, server_origin,
+ BoundNetLog(), &handler);
EXPECT_EQ(OK, rv);
ASSERT_FALSE(handler.get() == NULL);
EXPECT_EQ(HttpAuth::AUTH_SCHEME_NTLM, handler->auth_scheme());
@@ -168,11 +161,8 @@ TEST(HttpAuthHandlerFactoryTest, DefaultFactory) {
{
scoped_ptr<HttpAuthHandler> handler;
int rv = http_auth_handler_factory->CreateAuthHandlerFromString(
- "Negotiate",
- HttpAuth::AUTH_SERVER,
- server_origin,
- BoundNetLog(),
- &handler);
+ "Negotiate", HttpAuth::AUTH_SERVER, null_ssl_info, server_origin,
+ BoundNetLog(), &handler);
// Note the default factory doesn't support Kerberos on Android
#if defined(USE_KERBEROS) && !defined(OS_ANDROID)
EXPECT_EQ(OK, rv);
« net/cert/x509_util_openssl.cc ('K') | « net/http/http_auth_handler_factory.cc ('k') | net/http/http_auth_handler_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698