diff options
| author | Neil Fuller <nfuller@google.com> | 2015-08-06 17:28:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-06 17:28:38 +0000 |
| commit | bebe6fa75dcc0198fbd2a10f1e147e0f62989745 (patch) | |
| tree | 3e8036136adde4c420932270bc17c99b1263a53d | |
| parent | 8426987be01baeb67aa8f49a25a3ac56e1c4102a (diff) | |
| parent | 381dc32dba0a02497a29f267f11d074d4fe39bcd (diff) | |
| download | libcore-bebe6fa75dcc0198fbd2a10f1e147e0f62989745.zip libcore-bebe6fa75dcc0198fbd2a10f1e147e0f62989745.tar.gz libcore-bebe6fa75dcc0198fbd2a10f1e147e0f62989745.tar.bz2 | |
Merge "Revert "Revert "Changes associated with an OkHttp bad proxy response fix""" into lollipop-mr1-cts-dev
| -rw-r--r-- | luni/src/test/java/libcore/java/net/URLConnectionTest.java | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/luni/src/test/java/libcore/java/net/URLConnectionTest.java b/luni/src/test/java/libcore/java/net/URLConnectionTest.java index f664b08..c09939f 100644 --- a/luni/src/test/java/libcore/java/net/URLConnectionTest.java +++ b/luni/src/test/java/libcore/java/net/URLConnectionTest.java @@ -642,42 +642,32 @@ public final class URLConnectionTest extends AbstractResourceLeakageDetectorTest * Tolerate bad https proxy response when using HttpResponseCache. http://b/6754912 */ public void testConnectViaHttpProxyToHttpsUsingBadProxyAndHttpResponseCache() throws Exception { - ProxyConfig proxyConfig = ProxyConfig.PROXY_SYSTEM_PROPERTY; - TestSSLContext testSSLContext = TestSSLContext.create(); initResponseCache(); server.useHttps(testSSLContext.serverContext.getSocketFactory(), true); + + // The inclusion of a body in the response to the CONNECT is key to reproducing b/6754912. MockResponse badProxyResponse = new MockResponse() .setSocketPolicy(SocketPolicy.UPGRADE_TO_SSL_AT_END) .clearHeaders() - .setBody("bogus proxy connect response content"); // Key to reproducing b/6754912 + .setBody("bogus proxy connect response content"); - // We enqueue the bad response twice because the connection will - // be retried with TLS_MODE_COMPATIBLE after the first connection - // fails. - server.enqueue(badProxyResponse); server.enqueue(badProxyResponse); + server.enqueue(new MockResponse().setBody("response")); server.play(); URL url = new URL("https://android.com/foo"); + ProxyConfig proxyConfig = ProxyConfig.PROXY_SYSTEM_PROPERTY; HttpsURLConnection connection = (HttpsURLConnection) proxyConfig.connect(server, url); connection.setSSLSocketFactory(testSSLContext.clientContext.getSocketFactory()); - - try { - connection.connect(); - fail(); - } catch (SSLHandshakeException expected) { - // Thrown when the connect causes SSLSocket.startHandshake() to throw - // when it sees the "bogus proxy connect response content" - // instead of a ServerHello handshake message. - } + connection.setHostnameVerifier(new RecordingHostnameVerifier()); + assertContent("response", connection); RecordedRequest connect = server.takeRequest(); - assertEquals("Connect line failure on proxy", - "CONNECT android.com:443 HTTP/1.1", connect.getRequestLine()); + assertEquals("CONNECT android.com:443 HTTP/1.1", connect.getRequestLine()); assertContains(connect.getHeaders(), "Host: android.com"); } |