net/http/http_auth_handler_negotiate_unittest.cc - Issue 1128043007: Support Kerberos on Android

Unified Diff: net/http/http_auth_handler_negotiate_unittest.cc

Issue 1128043007: Support Kerberos on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix Android GN build Created 5 years, 6 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/http/http_auth_handler_negotiate_parse.cc ('K') | « net/http/http_auth_handler_negotiate_parse_unittest.cc ('k') | net/http/http_auth_handler_ntlm.cc » ('j') | net/http/http_auth_sspi_win.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/http/http_auth_handler_negotiate_unittest.cc

diff --git a/net/http/http_auth_handler_negotiate_unittest.cc b/net/http/http_auth_handler_negotiate_unittest.cc

index eaee8e5f40a6ace0affe30fd5813ee21eb17f9f0..b651a8e0061829efcd4de7c0e58ff02c48b721c4 100644

--- a/net/http/http_auth_handler_negotiate_unittest.cc

+++ b/net/http/http_auth_handler_negotiate_unittest.cc

@@ -4,6 +4,8 @@

#include "net/http/http_auth_handler_negotiate.h"

+#include <string>

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

#include "net/base/net_errors.h"

@@ -11,7 +13,9 @@

#include "net/dns/mock_host_resolver.h"

#include "net/http/http_request_info.h"

#include "net/http/mock_allow_url_security_manager.h"

-#if defined(OS_WIN)

+#if defined(OS_ANDROID)

+#include "net/android/dummy_spnego_authenticator.h"

+#elif defined(OS_WIN)

#include "net/http/mock_sspi_library_win.h"

#elif defined(OS_POSIX)

#include "net/http/mock_gssapi_library_posix.h"

@@ -21,7 +25,9 @@

namespace net {

-#if defined(OS_WIN)

+#if defined(OS_ANDROID)

+typedef net::android::DummySpnegoAuthenticator MockAuthLibrary;

+#elif defined(OS_WIN)

typedef MockSSPILibrary MockAuthLibrary;

#elif defined(OS_POSIX)

typedef test::MockGSSAPILibrary MockAuthLibrary;

@@ -38,10 +44,20 @@ class HttpAuthHandlerNegotiateTest : public PlatformTest {

url_security_manager_.reset(new MockAllowURLSecurityManager());

factory_.reset(new HttpAuthHandlerNegotiate::Factory());

factory_->set_url_security_manager(url_security_manager_.get());

+#if defined(OS_ANDROID)

+ factory_->set_account_type("org.chromium.test.DummySpnegoAuthenticator");

+ MockAuthLibrary::EnsureTestAccountExists();

+#endif

+#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_ANDROID))

factory_->set_library(auth_library_);

+#endif

factory_->set_host_resolver(resolver_.get());

}

+#if defined(OS_ANDROID)

+ void TearDown() override { MockAuthLibrary::RemoveTestAccounts(); }

+#endif

void SetupMocks(MockAuthLibrary* mock_library) {

#if defined(OS_WIN)

security_package_.reset(new SecPkgInfoW);

@@ -113,21 +129,21 @@ class HttpAuthHandlerNegotiateTest : public PlatformTest {

0, // Context flags

1, // Locally initiated

1); // Open

- test::MockGSSAPILibrary::SecurityContextQuery queries[] = {

- test::MockGSSAPILibrary::SecurityContextQuery(

- "Negotiate", // Package name

- GSS_S_CONTINUE_NEEDED, // Major response code

- 0, // Minor response code

- context1, // Context

- NULL, // Expected input token

- kAuthResponse), // Output token

- test::MockGSSAPILibrary::SecurityContextQuery(

- "Negotiate", // Package name

- GSS_S_COMPLETE, // Major response code

- 0, // Minor response code

- context2, // Context

- kAuthResponse, // Expected input token

- kAuthResponse) // Output token

+ MockAuthLibrary::SecurityContextQuery queries[] = {

+ MockAuthLibrary::SecurityContextQuery(

+ "Negotiate", // Package name

+ GSS_S_CONTINUE_NEEDED, // Major response code

+ 0, // Minor response code

+ context1, // Context

+ NULL, // Expected input token

+ kAuthResponse), // Output token

+ MockAuthLibrary::SecurityContextQuery(

+ "Negotiate", // Package name

+ GSS_S_COMPLETE, // Major response code

+ 0, // Minor response code

+ context2, // Context

+ kAuthResponse, // Expected input token

+ kAuthResponse) // Output token

};

for (size_t i = 0; i < arraysize(queries); ++i) {

@@ -154,13 +170,13 @@ class HttpAuthHandlerNegotiateTest : public PlatformTest {

0, // Context flags

1, // Locally initiated

0); // Open

- test::MockGSSAPILibrary::SecurityContextQuery query(

- "Negotiate", // Package name

- major_status, // Major response code

- minor_status, // Minor response code

- context, // Context

- NULL, // Expected input token

- NULL); // Output token

+ MockAuthLibrary::SecurityContextQuery query(

+ "Negotiate", // Package name

+ major_status, // Major response code

+ minor_status, // Minor response code

+ context, // Context

+ NULL, // Expected input token

+ NULL); // Output token

mock_library->ExpectSecurityContext(query.expected_package,

query.response_code,

@@ -223,8 +239,12 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCname) {

TestCompletionCallback callback;

HttpRequestInfo request_info;

std::string token;

- EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, &request_info,

- callback.callback(), &token));

+ int result = auth_handler->GenerateAuthToken(NULL, &request_info,

+ callback.callback(), &token);

+ if (result == ERR_IO_PENDING) {

+ result = callback.WaitForResult();

+ }

Ryan Sleevi 2015/06/29 13:56:45 nit: int result = callback.GetResult(auth_handler

aberent 2015/07/02 21:13:37 Done.

+ EXPECT_EQ(OK, result);

#if defined(OS_WIN)

EXPECT_EQ("HTTP/alias", auth_handler->spn());

#elif defined(OS_POSIX)

@@ -241,8 +261,12 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCnameStandardPort) {

TestCompletionCallback callback;

HttpRequestInfo request_info;

std::string token;

- EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, &request_info,

- callback.callback(), &token));

+ int result = auth_handler->GenerateAuthToken(NULL, &request_info,

+ callback.callback(), &token);

+ if (result == ERR_IO_PENDING) {

+ result = callback.WaitForResult();

+ }

Ryan Sleevi 2015/06/29 13:56:45 ditto

aberent 2015/07/02 21:13:37 Done.

+ EXPECT_EQ(OK, result);

#if defined(OS_WIN)

EXPECT_EQ("HTTP/alias", auth_handler->spn());

#elif defined(OS_POSIX)

@@ -259,8 +283,12 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCnameNonstandardPort) {

TestCompletionCallback callback;

HttpRequestInfo request_info;

std::string token;

- EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, &request_info,

- callback.callback(), &token));

+ int result = auth_handler->GenerateAuthToken(NULL, &request_info,

+ callback.callback(), &token);

+ if (result == ERR_IO_PENDING) {

+ result = callback.WaitForResult();

+ }

Ryan Sleevi 2015/06/29 13:56:45 ditto

aberent 2015/07/02 21:13:37 Done.

+ EXPECT_EQ(OK, result);

#if defined(OS_WIN)

EXPECT_EQ("HTTP/alias:500", auth_handler->spn());

#elif defined(OS_POSIX)

@@ -277,8 +305,12 @@ TEST_F(HttpAuthHandlerNegotiateTest, CnameSync) {

TestCompletionCallback callback;

HttpRequestInfo request_info;

std::string token;

- EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, &request_info,

- callback.callback(), &token));

+ int result = auth_handler->GenerateAuthToken(NULL, &request_info,

+ callback.callback(), &token);

+ if (result == ERR_IO_PENDING) {

+ result = callback.WaitForResult();

+ }

Ryan Sleevi 2015/06/29 13:56:45 ditto

aberent 2015/07/02 21:13:37 Done.

+ EXPECT_EQ(OK, result);

#if defined(OS_WIN)

EXPECT_EQ("HTTP/canonical.example.com", auth_handler->spn());

#elif defined(OS_POSIX)