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

Unified Diff: net/socket_stream/socket_stream_unittest.cc

Issue 10854139: Use HttpAuthController in SocketStream (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased and Skipped added browser test on chromeos Created 8 years, 4 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
« no previous file with comments | « net/socket_stream/socket_stream.cc ('k') | net/test/base_test_server.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket_stream/socket_stream_unittest.cc
diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc
index 63a19c31476624c04921b4beea73a79ba83105be..594b3a688153f42836c91f9232a8d6a35b364a0d 100644
--- a/net/socket_stream/socket_stream_unittest.cc
+++ b/net/socket_stream/socket_stream_unittest.cc
@@ -16,6 +16,7 @@
#include "net/base/net_log.h"
#include "net/base/net_log_unittest.h"
#include "net/base/test_completion_callback.h"
+#include "net/http/http_network_session.h"
#include "net/proxy/proxy_service.h"
#include "net/socket/socket_test_util.h"
#include "net/url_request/url_request_test_util.h"
@@ -435,6 +436,119 @@ TEST_F(SocketStreamTest, BasicAuthProxy) {
// TODO(eroman): Add back NetLogTest here...
}
+TEST_F(SocketStreamTest, BasicAuthProxyWithAuthCache) {
+ MockClientSocketFactory mock_socket_factory;
+ MockWrite data_writes[] = {
+ // WebSocket(SocketStream) always uses CONNECT when it is configured to use
+ // proxy so the port may not be 443.
+ MockWrite("CONNECT example.com:80 HTTP/1.1\r\n"
+ "Host: example.com\r\n"
+ "Proxy-Connection: keep-alive\r\n"
+ "Proxy-Authorization: Basic Zm9vOmJhcg==\r\n\r\n"),
+ };
+ MockRead data_reads[] = {
+ MockRead("HTTP/1.1 200 Connection Established\r\n"),
+ MockRead("Proxy-agent: Apache/2.2.8\r\n"),
+ MockRead("\r\n"),
+ MockRead(ASYNC, ERR_IO_PENDING)
+ };
+ StaticSocketDataProvider data(data_reads, arraysize(data_reads),
+ data_writes, arraysize(data_writes));
+ mock_socket_factory.AddSocketDataProvider(&data);
+
+ TestCompletionCallback test_callback;
+ scoped_ptr<SocketStreamEventRecorder> delegate(
+ new SocketStreamEventRecorder(test_callback.callback()));
+ delegate->SetOnConnected(base::Bind(&SocketStreamEventRecorder::DoClose,
+ base::Unretained(delegate.get())));
+
+ scoped_refptr<SocketStream> socket_stream(
+ new SocketStream(GURL("ws://example.com/demo"), delegate.get()));
+
+ TestURLRequestContextWithProxy context("myproxy:70");
+ HttpAuthCache* auth_cache =
+ context.http_transaction_factory()->GetSession()->http_auth_cache();
+ auth_cache->Add(GURL("http://myproxy:70"),
+ "MyRealm1",
+ HttpAuth::AUTH_SCHEME_BASIC,
+ "Basic realm=MyRealm1",
+ AuthCredentials(ASCIIToUTF16("foo"),
+ ASCIIToUTF16("bar")),
+ "/");
+
+ socket_stream->set_context(&context);
+ socket_stream->SetClientSocketFactory(&mock_socket_factory);
+
+ socket_stream->Connect();
+
+ test_callback.WaitForResult();
+
+ const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents();
+ ASSERT_EQ(4U, events.size());
+ EXPECT_EQ(SocketStreamEvent::EVENT_START_OPEN_CONNECTION,
+ events[0].event_type);
+ EXPECT_EQ(SocketStreamEvent::EVENT_CONNECTED, events[1].event_type);
+ EXPECT_EQ(net::ERR_ABORTED, events[2].error_code);
+ EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[3].event_type);
+}
+
+TEST_F(SocketStreamTest, WSSBasicAuthProxyWithAuthCache) {
+ MockClientSocketFactory mock_socket_factory;
+ MockWrite data_writes1[] = {
+ MockWrite("CONNECT example.com:443 HTTP/1.1\r\n"
+ "Host: example.com\r\n"
+ "Proxy-Connection: keep-alive\r\n"
+ "Proxy-Authorization: Basic Zm9vOmJhcg==\r\n\r\n"),
+ };
+ MockRead data_reads1[] = {
+ MockRead("HTTP/1.1 200 Connection Established\r\n"),
+ MockRead("Proxy-agent: Apache/2.2.8\r\n"),
+ MockRead("\r\n"),
+ MockRead(ASYNC, ERR_IO_PENDING)
+ };
+ StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
+ data_writes1, arraysize(data_writes1));
+ mock_socket_factory.AddSocketDataProvider(&data1);
+
+ SSLSocketDataProvider data2(ASYNC, OK);
+ mock_socket_factory.AddSSLSocketDataProvider(&data2);
+
+ TestCompletionCallback test_callback;
+ scoped_ptr<SocketStreamEventRecorder> delegate(
+ new SocketStreamEventRecorder(test_callback.callback()));
+ delegate->SetOnConnected(base::Bind(&SocketStreamEventRecorder::DoClose,
+ base::Unretained(delegate.get())));
+
+ scoped_refptr<SocketStream> socket_stream(
+ new SocketStream(GURL("wss://example.com/demo"), delegate.get()));
+
+ TestURLRequestContextWithProxy context("myproxy:70");
+ HttpAuthCache* auth_cache =
+ context.http_transaction_factory()->GetSession()->http_auth_cache();
+ auth_cache->Add(GURL("http://myproxy:70"),
+ "MyRealm1",
+ HttpAuth::AUTH_SCHEME_BASIC,
+ "Basic realm=MyRealm1",
+ AuthCredentials(ASCIIToUTF16("foo"),
+ ASCIIToUTF16("bar")),
+ "/");
+
+ socket_stream->set_context(&context);
+ socket_stream->SetClientSocketFactory(&mock_socket_factory);
+
+ socket_stream->Connect();
+
+ test_callback.WaitForResult();
+
+ const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents();
+ ASSERT_EQ(4U, events.size());
+ EXPECT_EQ(SocketStreamEvent::EVENT_START_OPEN_CONNECTION,
+ events[0].event_type);
+ EXPECT_EQ(SocketStreamEvent::EVENT_CONNECTED, events[1].event_type);
+ EXPECT_EQ(net::ERR_ABORTED, events[2].error_code);
+ EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[3].event_type);
+}
+
TEST_F(SocketStreamTest, IOPending) {
TestCompletionCallback test_callback;
« no previous file with comments | « net/socket_stream/socket_stream.cc ('k') | net/test/base_test_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698