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

Side by Side Diff: net/http/http_network_layer_unittest.cc

Issue 10987043: Receiving Connection: Proxy-Bypass induces proxy fallback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tests Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | net/http/http_network_transaction.cc » ('j') | net/proxy/proxy_service.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_network_layer.h" 5 #include "net/http/http_network_layer.h"
6 6
7 #include "net/base/mock_cert_verifier.h" 7 #include "net/base/mock_cert_verifier.h"
8 #include "net/base/mock_host_resolver.h" 8 #include "net/base/mock_host_resolver.h"
9 #include "net/base/net_log.h" 9 #include "net/base/net_log.h"
10 #include "net/base/ssl_config_service_defaults.h" 10 #include "net/base/ssl_config_service_defaults.h"
11 #include "net/http/http_network_session.h" 11 #include "net/http/http_network_session.h"
12 #include "net/http/http_server_properties_impl.h" 12 #include "net/http/http_server_properties_impl.h"
13 #include "net/http/http_transaction_unittest.h" 13 #include "net/http/http_transaction_unittest.h"
14 #include "net/proxy/proxy_service.h" 14 #include "net/proxy/proxy_service.h"
15 #include "net/socket/socket_test_util.h" 15 #include "net/socket/socket_test_util.h"
16 #include "net/spdy/spdy_session_pool.h" 16 #include "net/spdy/spdy_session_pool.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 #include "testing/platform_test.h" 18 #include "testing/platform_test.h"
19 19
20 namespace net { 20 namespace net {
21 21
22 namespace { 22 namespace {
23 23
24 class HttpNetworkLayerTest : public PlatformTest { 24 class HttpNetworkLayerTest : public PlatformTest {
25 protected: 25 protected:
26 HttpNetworkLayerTest() 26 HttpNetworkLayerTest() : ssl_config_service_(new SSLConfigServiceDefaults) {}
27 : cert_verifier_(new MockCertVerifier), 27
28 proxy_service_(ProxyService::CreateDirect()), 28 virtual void SetUp() {
29 ssl_config_service_(new SSLConfigServiceDefaults) { 29 ConfigureTestDependencies(ProxyService::CreateDirect());
30 }
31
32 void ConfigureTestDependencies(ProxyService* proxy_service) {
33 cert_verifier_.reset(new MockCertVerifier);
34 proxy_service_.reset(proxy_service);
30 HttpNetworkSession::Params session_params; 35 HttpNetworkSession::Params session_params;
31 session_params.client_socket_factory = &mock_socket_factory_; 36 session_params.client_socket_factory = &mock_socket_factory_;
32 session_params.host_resolver = &host_resolver_; 37 session_params.host_resolver = &host_resolver_;
33 session_params.cert_verifier = cert_verifier_.get(); 38 session_params.cert_verifier = cert_verifier_.get();
34 session_params.proxy_service = proxy_service_.get(); 39 session_params.proxy_service = proxy_service_.get();
35 session_params.ssl_config_service = ssl_config_service_; 40 session_params.ssl_config_service = ssl_config_service_;
36 session_params.http_server_properties = &http_server_properties_; 41 session_params.http_server_properties = &http_server_properties_;
37 network_session_ = new HttpNetworkSession(session_params); 42 network_session_ = new HttpNetworkSession(session_params);
38 factory_.reset(new HttpNetworkLayer(network_session_)); 43 factory_.reset(new HttpNetworkLayer(network_session_));
39 } 44 }
40 45
41 MockClientSocketFactory mock_socket_factory_; 46 MockClientSocketFactory mock_socket_factory_;
42 MockHostResolver host_resolver_; 47 MockHostResolver host_resolver_;
43 scoped_ptr<CertVerifier> cert_verifier_; 48 scoped_ptr<CertVerifier> cert_verifier_;
44 const scoped_ptr<ProxyService> proxy_service_; 49 scoped_ptr<ProxyService> proxy_service_;
45 const scoped_refptr<SSLConfigService> ssl_config_service_; 50 const scoped_refptr<SSLConfigService> ssl_config_service_;
46 scoped_refptr<HttpNetworkSession> network_session_; 51 scoped_refptr<HttpNetworkSession> network_session_;
47 scoped_ptr<HttpNetworkLayer> factory_; 52 scoped_ptr<HttpNetworkLayer> factory_;
48 HttpServerPropertiesImpl http_server_properties_; 53 HttpServerPropertiesImpl http_server_properties_;
49 }; 54 };
50 55
51 TEST_F(HttpNetworkLayerTest, CreateAndDestroy) { 56 TEST_F(HttpNetworkLayerTest, CreateAndDestroy) {
52 scoped_ptr<HttpTransaction> trans; 57 scoped_ptr<HttpTransaction> trans;
53 int rv = factory_->CreateTransaction(&trans, NULL); 58 int rv = factory_->CreateTransaction(&trans, NULL);
54 EXPECT_EQ(OK, rv); 59 EXPECT_EQ(OK, rv);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 if (rv == ERR_IO_PENDING) 113 if (rv == ERR_IO_PENDING)
109 rv = callback.WaitForResult(); 114 rv = callback.WaitForResult();
110 ASSERT_EQ(OK, rv); 115 ASSERT_EQ(OK, rv);
111 116
112 std::string contents; 117 std::string contents;
113 rv = ReadTransaction(trans.get(), &contents); 118 rv = ReadTransaction(trans.get(), &contents);
114 EXPECT_EQ(OK, rv); 119 EXPECT_EQ(OK, rv);
115 EXPECT_EQ("hello world", contents); 120 EXPECT_EQ("hello world", contents);
116 } 121 }
117 122
123 TEST_F(HttpNetworkLayerTest, ServerFallback) {
124 // Verify that a Connection: Proxy-Bypass header induces proxy fallback to
125 // a second proxy, if configured.
126
127 // To configure this test, we need to wire up a custom proxy service to use
128 // a pair of proxies. We'll induce fallback via the first and return
129 // the expected data via the second.
130 ConfigureTestDependencies(ProxyService::CreateFixedFromPacResult(
131 "PROXY bad:8080; PROXY good:8080"));
132
133 MockRead data_reads[] = {
134 MockRead("HTTP/1.1 200 OK\r\n"
135 "Connection: proxy-bypass\r\n\r\n"),
136 MockRead("Bypass message"),
137 MockRead(SYNCHRONOUS, OK),
138 };
139 MockWrite data_writes[] = {
140 MockWrite("GET http://www.google.com/ HTTP/1.1\r\n"
141 "Host: www.google.com\r\n"
142 "Proxy-Connection: keep-alive\r\n\r\n"),
143 };
144 StaticSocketDataProvider data1(data_reads, arraysize(data_reads),
145 data_writes, arraysize(data_writes));
146 mock_socket_factory_.AddSocketDataProvider(&data1);
147
148 // Second data provider returns the expected content.
149 MockRead data_reads2[] = {
150 MockRead("HTTP/1.0 200 OK\r\n\r\n"),
151 MockRead("content"),
152 MockRead(SYNCHRONOUS, OK),
153 };
154 MockWrite data_writes2[] = {
155 MockWrite("GET http://www.google.com/ HTTP/1.1\r\n"
156 "Host: www.google.com\r\n"
157 "Proxy-Connection: keep-alive\r\n\r\n"),
158 };
159 StaticSocketDataProvider data2(data_reads2, arraysize(data_reads2),
160 data_writes2, arraysize(data_writes2));
161 mock_socket_factory_.AddSocketDataProvider(&data2);
162
163 TestCompletionCallback callback;
164
165 HttpRequestInfo request_info;
166 request_info.url = GURL("http://www.google.com/");
167 request_info.method = "GET";
168 request_info.load_flags = LOAD_NORMAL;
169
170 scoped_ptr<HttpTransaction> trans;
171 int rv = factory_->CreateTransaction(&trans, NULL);
172 EXPECT_EQ(OK, rv);
173
174 rv = trans->Start(&request_info, callback.callback(), BoundNetLog());
175 if (rv == ERR_IO_PENDING)
176 rv = callback.WaitForResult();
177 ASSERT_EQ(OK, rv);
178
179 std::string contents;
180 rv = ReadTransaction(trans.get(), &contents);
181 EXPECT_EQ(OK, rv);
182
183 // We should obtain content from the second socket provider write
184 // corresponding to the fallback proxy.
185 EXPECT_EQ("content", contents);
186 // We should also observe the bad proxy in the retry list.
187 ASSERT_EQ(1u, proxy_service_->proxy_retry_info().size());
188 EXPECT_EQ("bad:8080", (*proxy_service_->proxy_retry_info().begin()).first);
eroman 2012/10/08 22:29:25 Please also verify the headers -- check at least o
Michael Piatek 2012/10/09 21:05:08 Done.
189 }
190
191 TEST_F(HttpNetworkLayerTest, ServerFallbackDoesntLoop) {
192 // Verify that a Connection: Proxy-Bypass header will display the original
193 // proxy's error page content if a fallback option is not configured.
194 ConfigureTestDependencies(ProxyService::CreateFixedFromPacResult(
195 "PROXY bad:8080"));
196
197 MockRead data_reads[] = {
198 MockRead("HTTP/1.1 200 OK\r\n"
199 "Connection: proxy-bypass\r\n\r\n"),
200 MockRead("Bypass message"),
201 MockRead(SYNCHRONOUS, OK),
202 };
203 MockWrite data_writes[] = {
204 MockWrite("GET http://www.google.com/ HTTP/1.1\r\n"
205 "Host: www.google.com\r\n"
206 "Proxy-Connection: keep-alive\r\n\r\n"),
207 };
208 StaticSocketDataProvider data1(data_reads, arraysize(data_reads),
209 data_writes, arraysize(data_writes));
210 mock_socket_factory_.AddSocketDataProvider(&data1);
211
212 TestCompletionCallback callback;
213
214 HttpRequestInfo request_info;
215 request_info.url = GURL("http://www.google.com/");
216 request_info.method = "GET";
217 request_info.load_flags = LOAD_NORMAL;
218
219 scoped_ptr<HttpTransaction> trans;
220 int rv = factory_->CreateTransaction(&trans, NULL);
221 EXPECT_EQ(OK, rv);
222
223 rv = trans->Start(&request_info, callback.callback(), BoundNetLog());
224 if (rv == ERR_IO_PENDING)
225 rv = callback.WaitForResult();
226 ASSERT_EQ(OK, rv);
227
228 std::string contents;
229 rv = ReadTransaction(trans.get(), &contents);
230 EXPECT_EQ(OK, rv);
231 EXPECT_EQ("Bypass message", contents);
232
233 // Despite not falling back to anything, we should still observe the proxy
234 // in the bad proxies list.
235 ASSERT_EQ(1u, proxy_service_->proxy_retry_info().size());
236 EXPECT_EQ("bad:8080", (*proxy_service_->proxy_retry_info().begin()).first);
237 }
238
118 } // namespace 239 } // namespace
119 240
120 } // namespace net 241 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/http/http_network_transaction.cc » ('j') | net/proxy/proxy_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698