Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7639A17CF4 for ; Thu, 6 Nov 2014 14:32:44 +0000 (UTC) Received: (qmail 26949 invoked by uid 500); 6 Nov 2014 14:32:44 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 26906 invoked by uid 500); 6 Nov 2014 14:32:44 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 26897 invoked by uid 99); 6 Nov 2014 14:32:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Nov 2014 14:32:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Nov 2014 14:32:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 114852388C9E for ; Thu, 6 Nov 2014 14:30:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1637120 [30/40] - in /httpcomponents/site: ./ httpcomponents-asyncclient-4.0.x/ httpcomponents-asyncclient-4.1.x/ httpcomponents-client-4.3.x/ httpcomponents-client-4.3.x/fluent-hc/ httpcomponents-client-4.3.x/fluent-hc/apidocs/ httpcompon... Date: Thu, 06 Nov 2014 14:29:58 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141106143057.114852388C9E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-frame.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-frame.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-frame.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.client.config + Apache HttpClient 4.3.6 Reference Package org.apache.http.client.config Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-summary.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-summary.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-summary.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.client.config + Apache HttpClient 4.3.6 Reference Package org.apache.http.client.config Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-frame.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-frame.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-frame.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.client.entity + Apache HttpClient 4.3.6 Reference Package org.apache.http.client.entity Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-summary.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-summary.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-summary.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.client.entity + Apache HttpClient 4.3.6 Reference Package org.apache.http.client.entity Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-frame.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-frame.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-frame.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.client.methods + Apache HttpClient 4.3.6 Reference Package org.apache.http.client.methods Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-summary.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-summary.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-summary.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.client.methods + Apache HttpClient 4.3.6 Reference Package org.apache.http.client.methods Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-frame.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-frame.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-frame.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.client.protocol + Apache HttpClient 4.3.6 Reference Package org.apache.http.client.protocol Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-summary.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-summary.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-summary.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.client.protocol + Apache HttpClient 4.3.6 Reference Package org.apache.http.client.protocol Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-frame.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-frame.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-frame.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.client.utils + Apache HttpClient 4.3.6 Reference Package org.apache.http.client.utils Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-summary.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-summary.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-summary.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.client.utils + Apache HttpClient 4.3.6 Reference Package org.apache.http.client.utils Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-frame.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-frame.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-frame.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.conn + Apache HttpClient 4.3.6 Reference Package org.apache.http.conn Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-summary.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-summary.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-summary.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.conn + Apache HttpClient 4.3.6 Reference Package org.apache.http.conn Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-frame.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-frame.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-frame.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.conn.routing + Apache HttpClient 4.3.6 Reference Package org.apache.http.conn.routing Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-summary.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-summary.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-summary.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.conn.routing + Apache HttpClient 4.3.6 Reference Package org.apache.http.conn.routing Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/TestSSLSocketFactory.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/TestSSLSocketFactory.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/TestSSLSocketFactory.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/TestSSLSocketFactory.html Thu Nov 6 14:29:37 2014 @@ -205,116 +205,170 @@ 195 } 196 197 @Test -198 public void testClientAuthSSLAliasChoice() throws Exception { -199 final PrivateKeyStrategy aliasStrategy = new PrivateKeyStrategy() { -200 -201 public String chooseAlias( -202 final Map<String, PrivateKeyDetails> aliases, final Socket socket) { -203 Assert.assertEquals(2, aliases.size()); -204 Assert.assertTrue(aliases.containsKey("hc-test-key-1")); -205 Assert.assertTrue(aliases.containsKey("hc-test-key-2")); -206 return "hc-test-key-2"; -207 } +198 public void testTLSOnly() throws Exception { +199 final SSLContext serverSSLContext = SSLContexts.custom() +200 .useProtocol("TLS") +201 .loadTrustMaterial(keystore) +202 .loadKeyMaterial(keystore, "nopassword".toCharArray()) +203 .build(); +204 final SSLContext clientSSLContext = SSLContexts.custom() +205 .useProtocol("TLS") +206 .loadTrustMaterial(keystore) +207 .build(); 208 -209 }; -210 -211 final SSLContext serverSSLContext = SSLContexts.custom() -212 .useProtocol("TLS") -213 .loadTrustMaterial(keystore) -214 .loadKeyMaterial(keystore, "nopassword".toCharArray()) -215 .build(); -216 final SSLContext clientSSLContext = SSLContexts.custom() -217 .useProtocol("TLS") -218 .loadTrustMaterial(keystore) -219 .loadKeyMaterial(keystore, "nopassword".toCharArray(), aliasStrategy) -220 .build(); +209 this.localServer = new LocalTestServer(serverSSLContext, false, new String[] {"TLSv1"}); +210 this.localServer.registerDefaultHandlers(); +211 this.localServer.start(); +212 +213 final HttpHost host = new HttpHost("localhost", 443, "https"); +214 final HttpContext context = new BasicHttpContext(); +215 final TestX509HostnameVerifier hostVerifier = new TestX509HostnameVerifier(); +216 final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(clientSSLContext, hostVerifier); +217 final Socket socket = socketFactory.createSocket(context); +218 final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); +219 final SSLSocket sslSocket = (SSLSocket) socketFactory.connectSocket(0, socket, host, remoteAddress, null, context); +220 final SSLSession sslsession = sslSocket.getSession(); 221 -222 this.localServer = new LocalTestServer(serverSSLContext, true); -223 this.localServer.registerDefaultHandlers(); -224 this.localServer.start(); +222 Assert.assertNotNull(sslsession); +223 Assert.assertTrue(hostVerifier.isFired()); +224 } 225 -226 final HttpHost host = new HttpHost("localhost", 443, "https"); -227 final HttpContext context = new BasicHttpContext(); -228 final TestX509HostnameVerifier hostVerifier = new TestX509HostnameVerifier(); -229 final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(clientSSLContext, hostVerifier); -230 final Socket socket = socketFactory.createSocket(context); -231 final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); -232 final SSLSocket sslSocket = (SSLSocket) socketFactory.connectSocket(0, socket, host, remoteAddress, null, context); -233 final SSLSession sslsession = sslSocket.getSession(); -234 -235 Assert.assertNotNull(sslsession); -236 Assert.assertTrue(hostVerifier.isFired()); -237 } -238 -239 @Test(expected=SSLHandshakeException.class) -240 public void testSSLTrustVerification() throws Exception { -241 final SSLContext serverSSLContext = SSLContexts.custom() -242 .useProtocol("TLS") -243 .loadTrustMaterial(keystore) -244 .loadKeyMaterial(keystore, "nopassword".toCharArray()) -245 .build(); -246 -247 this.localServer = new LocalTestServer(serverSSLContext); -248 this.localServer.registerDefaultHandlers(); -249 this.localServer.start(); +226 @Test(expected=IOException.class) +227 public void testSSLDisabledByDefault() throws Exception { +228 final SSLContext serverSSLContext = SSLContexts.custom() +229 .useProtocol("TLS") +230 .loadTrustMaterial(keystore) +231 .loadKeyMaterial(keystore, "nopassword".toCharArray()) +232 .build(); +233 final SSLContext clientSSLContext = SSLContexts.custom() +234 .useProtocol("TLS") +235 .loadTrustMaterial(keystore) +236 .build(); +237 +238 this.localServer = new LocalTestServer(serverSSLContext, false, new String[] {"SSLv3"}); +239 this.localServer.registerDefaultHandlers(); +240 this.localServer.start(); +241 +242 final HttpHost host = new HttpHost("localhost", 443, "https"); +243 final HttpContext context = new BasicHttpContext(); +244 final TestX509HostnameVerifier hostVerifier = new TestX509HostnameVerifier(); +245 final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(clientSSLContext, hostVerifier); +246 final Socket socket = socketFactory.createSocket(context); +247 final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); +248 socketFactory.connectSocket(0, socket, host, remoteAddress, null, context); +249 } 250 -251 final HttpHost host = new HttpHost("localhost", 443, "https"); -252 final HttpContext context = new BasicHttpContext(); -253 // Use default SSL context -254 final SSLContext defaultsslcontext = SSLContexts.createDefault(); -255 -256 final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(defaultsslcontext, -257 SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); -258 -259 final Socket socket = socketFactory.createSocket(context); -260 final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); -261 socketFactory.connectSocket(0, socket, host, remoteAddress, null, context); -262 } -263 -264 @Test -265 public void testSSLTrustVerificationOverride() throws Exception { -266 final SSLContext serverSSLContext = SSLContexts.custom() -267 .useProtocol("TLS") -268 .loadTrustMaterial(keystore) -269 .loadKeyMaterial(keystore, "nopassword".toCharArray()) -270 .build(); -271 -272 this.localServer = new LocalTestServer(serverSSLContext); -273 this.localServer.registerDefaultHandlers(); -274 this.localServer.start(); +251 @Test +252 public void testClientAuthSSLAliasChoice() throws Exception { +253 final PrivateKeyStrategy aliasStrategy = new PrivateKeyStrategy() { +254 +255 public String chooseAlias( +256 final Map<String, PrivateKeyDetails> aliases, final Socket socket) { +257 Assert.assertEquals(2, aliases.size()); +258 Assert.assertTrue(aliases.containsKey("hc-test-key-1")); +259 Assert.assertTrue(aliases.containsKey("hc-test-key-2")); +260 return "hc-test-key-2"; +261 } +262 +263 }; +264 +265 final SSLContext serverSSLContext = SSLContexts.custom() +266 .useProtocol("TLS") +267 .loadTrustMaterial(keystore) +268 .loadKeyMaterial(keystore, "nopassword".toCharArray()) +269 .build(); +270 final SSLContext clientSSLContext = SSLContexts.custom() +271 .useProtocol("TLS") +272 .loadTrustMaterial(keystore) +273 .loadKeyMaterial(keystore, "nopassword".toCharArray(), aliasStrategy) +274 .build(); 275 -276 final HttpHost host = new HttpHost("localhost", 443, "https"); -277 final HttpContext context = new BasicHttpContext(); -278 -279 final TrustStrategy trustStrategy = new TrustStrategy() { -280 -281 public boolean isTrusted( -282 final X509Certificate[] chain, final String authType) throws CertificateException { -283 return chain.length == 1; -284 } -285 -286 }; -287 final SSLContext sslcontext = SSLContexts.custom() -288 .loadTrustMaterial(null, trustStrategy) -289 .build(); -290 final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory( -291 sslcontext, -292 SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); -293 -294 final Socket socket = socketFactory.createSocket(context); -295 final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); -296 socketFactory.connectSocket(0, socket, host, remoteAddress, null, context); -297 } -298 -299 @Test -300 public void testDefaultHostnameVerifier() throws Exception { -301 final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory( -302 SSLContexts.createDefault(), -303 null); -304 Assert.assertNotNull(socketFactory.getHostnameVerifier()); -305 } -306 -307 } +276 this.localServer = new LocalTestServer(serverSSLContext, true); +277 this.localServer.registerDefaultHandlers(); +278 this.localServer.start(); +279 +280 final HttpHost host = new HttpHost("localhost", 443, "https"); +281 final HttpContext context = new BasicHttpContext(); +282 final TestX509HostnameVerifier hostVerifier = new TestX509HostnameVerifier(); +283 final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(clientSSLContext, hostVerifier); +284 final Socket socket = socketFactory.createSocket(context); +285 final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); +286 final SSLSocket sslSocket = (SSLSocket) socketFactory.connectSocket(0, socket, host, remoteAddress, null, context); +287 final SSLSession sslsession = sslSocket.getSession(); +288 +289 Assert.assertNotNull(sslsession); +290 Assert.assertTrue(hostVerifier.isFired()); +291 } +292 +293 @Test(expected=SSLHandshakeException.class) +294 public void testSSLTrustVerification() throws Exception { +295 final SSLContext serverSSLContext = SSLContexts.custom() +296 .useProtocol("TLS") +297 .loadTrustMaterial(keystore) +298 .loadKeyMaterial(keystore, "nopassword".toCharArray()) +299 .build(); +300 +301 this.localServer = new LocalTestServer(serverSSLContext); +302 this.localServer.registerDefaultHandlers(); +303 this.localServer.start(); +304 +305 final HttpHost host = new HttpHost("localhost", 443, "https"); +306 final HttpContext context = new BasicHttpContext(); +307 // Use default SSL context +308 final SSLContext defaultsslcontext = SSLContexts.createDefault(); +309 +310 final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(defaultsslcontext, +311 SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); +312 +313 final Socket socket = socketFactory.createSocket(context); +314 final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); +315 socketFactory.connectSocket(0, socket, host, remoteAddress, null, context); +316 } +317 +318 @Test +319 public void testSSLTrustVerificationOverride() throws Exception { +320 final SSLContext serverSSLContext = SSLContexts.custom() +321 .useProtocol("TLS") +322 .loadTrustMaterial(keystore) +323 .loadKeyMaterial(keystore, "nopassword".toCharArray()) +324 .build(); +325 +326 this.localServer = new LocalTestServer(serverSSLContext); +327 this.localServer.registerDefaultHandlers(); +328 this.localServer.start(); +329 +330 final HttpHost host = new HttpHost("localhost", 443, "https"); +331 final HttpContext context = new BasicHttpContext(); +332 +333 final TrustStrategy trustStrategy = new TrustStrategy() { +334 +335 public boolean isTrusted( +336 final X509Certificate[] chain, final String authType) throws CertificateException { +337 return chain.length == 1; +338 } +339 +340 }; +341 final SSLContext sslcontext = SSLContexts.custom() +342 .loadTrustMaterial(null, trustStrategy) +343 .build(); +344 final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory( +345 sslcontext, +346 SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); +347 +348 final Socket socket = socketFactory.createSocket(context); +349 final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); +350 socketFactory.connectSocket(0, socket, host, remoteAddress, null, context); +351 } +352 +353 @Test +354 public void testDefaultHostnameVerifier() throws Exception { +355 final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory( +356 SSLContexts.createDefault(), +357 null); +358 Assert.assertNotNull(socketFactory.getHostnameVerifier()); +359 } +360 +361 }
Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-frame.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-frame.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-frame.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.conn.ssl + Apache HttpClient 4.3.6 Reference Package org.apache.http.conn.ssl Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-summary.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-summary.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-summary.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.conn.ssl + Apache HttpClient 4.3.6 Reference Package org.apache.http.conn.ssl Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-frame.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-frame.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-frame.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.conn.util + Apache HttpClient 4.3.6 Reference Package org.apache.http.conn.util Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-summary.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-summary.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-summary.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.conn.util + Apache HttpClient 4.3.6 Reference Package org.apache.http.conn.util Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-frame.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-frame.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-frame.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.cookie + Apache HttpClient 4.3.6 Reference Package org.apache.http.cookie Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-summary.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-summary.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-summary.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.cookie + Apache HttpClient 4.3.6 Reference Package org.apache.http.cookie Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-frame.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-frame.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-frame.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.auth + Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.auth Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-summary.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-summary.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-summary.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.auth + Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.auth Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/TestClientAuthentication.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/TestClientAuthentication.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/TestClientAuthentication.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/TestClientAuthentication.html Thu Nov 6 14:29:37 2014 @@ -245,7 +245,7 @@ 235 .add(new RequestBasicAuth()) 236 .add(new ResponseBasicUnauthorized()).build(); 237 this.localServer = new LocalTestServer( -238 httpproc, null, null, new AuthExpectationVerifier(), null, false); +238 httpproc, null, null, new AuthExpectationVerifier(), null, false, null); 239 this.localServer.register("*", new AuthHandler()); 240 this.localServer.start(); 241 Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-frame.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-frame.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-frame.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.client.integration + Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.client.integration Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-summary.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-summary.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-summary.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.client.integration + Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.client.integration Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-frame.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-frame.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-frame.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.client + Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.client Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-summary.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-summary.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-summary.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.client + Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.client Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/TestHttpClientConnectionOperator.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/TestHttpClientConnectionOperator.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/TestHttpClientConnectionOperator.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/TestHttpClientConnectionOperator.html Thu Nov 6 14:29:37 2014 @@ -217,43 +217,75 @@ 207 } 208 209 @Test -210 public void testUpgrade() throws Exception { +210 public void testConnectExplicitAddress() throws Exception { 211 final HttpContext context = new BasicHttpContext(); -212 final HttpHost host = new HttpHost("somehost", -1, "https"); -213 -214 Mockito.when(socketFactoryRegistry.lookup("https")).thenReturn(sslSocketFactory); -215 Mockito.when(schemePortResolver.resolve(host)).thenReturn(443); -216 Mockito.when(sslSocketFactory.createSocket(Mockito.<HttpContext>any())).thenReturn(socket); -217 Mockito.when(sslSocketFactory.createLayeredSocket( -218 Mockito.<Socket>any(), -219 Mockito.eq("somehost"), -220 Mockito.eq(443), -221 Mockito.<HttpContext>any())).thenReturn(socket); -222 -223 connectionOperator.upgrade(conn, host, context); -224 -225 Mockito.verify(conn).bind(socket); -226 } -227 -228 @Test(expected=UnsupportedSchemeException.class) -229 public void testUpgradeUpsupportedScheme() throws Exception { -230 final HttpContext context = new BasicHttpContext(); -231 final HttpHost host = new HttpHost("somehost", -1, "httpsssss"); -232 Mockito.when(socketFactoryRegistry.lookup("http")).thenReturn(plainSocketFactory); -233 -234 connectionOperator.upgrade(conn, host, context); -235 } -236 -237 @Test(expected=UnsupportedSchemeException.class) -238 public void testUpgradeNonLayeringScheme() throws Exception { -239 final HttpContext context = new BasicHttpContext(); -240 final HttpHost host = new HttpHost("somehost", -1, "http"); -241 Mockito.when(socketFactoryRegistry.lookup("http")).thenReturn(plainSocketFactory); -242 -243 connectionOperator.upgrade(conn, host, context); -244 } +212 final InetAddress local = InetAddress.getByAddress(new byte[] {127, 0, 0, 0}); +213 final InetAddress ip = InetAddress.getByAddress(new byte[] {127, 0, 0, 23}); +214 final HttpHost host = new HttpHost(ip); +215 +216 Mockito.when(socketFactoryRegistry.lookup("http")).thenReturn(plainSocketFactory); +217 Mockito.when(schemePortResolver.resolve(host)).thenReturn(80); +218 Mockito.when(plainSocketFactory.createSocket(Mockito.<HttpContext>any())).thenReturn(socket); +219 Mockito.when(plainSocketFactory.connectSocket( +220 Mockito.anyInt(), +221 Mockito.<Socket>any(), +222 Mockito.<HttpHost>any(), +223 Mockito.<InetSocketAddress>any(), +224 Mockito.<InetSocketAddress>any(), +225 Mockito.<HttpContext>any())).thenReturn(socket); +226 +227 final InetSocketAddress localAddress = new InetSocketAddress(local, 0); +228 connectionOperator.connect(conn, host, localAddress, 1000, SocketConfig.DEFAULT, context); +229 +230 Mockito.verify(plainSocketFactory).connectSocket( +231 1000, +232 socket, +233 host, +234 new InetSocketAddress(ip, 80), +235 localAddress, +236 context); +237 Mockito.verify(dnsResolver, Mockito.never()).resolve(Mockito.anyString()); +238 Mockito.verify(conn, Mockito.times(2)).bind(socket); +239 } +240 +241 @Test +242 public void testUpgrade() throws Exception { +243 final HttpContext context = new BasicHttpContext(); +244 final HttpHost host = new HttpHost("somehost", -1, "https"); 245 -246 } +246 Mockito.when(socketFactoryRegistry.lookup("https")).thenReturn(sslSocketFactory); +247 Mockito.when(schemePortResolver.resolve(host)).thenReturn(443); +248 Mockito.when(sslSocketFactory.createSocket(Mockito.<HttpContext>any())).thenReturn(socket); +249 Mockito.when(sslSocketFactory.createLayeredSocket( +250 Mockito.<Socket>any(), +251 Mockito.eq("somehost"), +252 Mockito.eq(443), +253 Mockito.<HttpContext>any())).thenReturn(socket); +254 +255 connectionOperator.upgrade(conn, host, context); +256 +257 Mockito.verify(conn).bind(socket); +258 } +259 +260 @Test(expected=UnsupportedSchemeException.class) +261 public void testUpgradeUpsupportedScheme() throws Exception { +262 final HttpContext context = new BasicHttpContext(); +263 final HttpHost host = new HttpHost("somehost", -1, "httpsssss"); +264 Mockito.when(socketFactoryRegistry.lookup("http")).thenReturn(plainSocketFactory); +265 +266 connectionOperator.upgrade(conn, host, context); +267 } +268 +269 @Test(expected=UnsupportedSchemeException.class) +270 public void testUpgradeNonLayeringScheme() throws Exception { +271 final HttpContext context = new BasicHttpContext(); +272 final HttpHost host = new HttpHost("somehost", -1, "http"); +273 Mockito.when(socketFactoryRegistry.lookup("http")).thenReturn(plainSocketFactory); +274 +275 connectionOperator.upgrade(conn, host, context); +276 } +277 +278 }
Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-frame.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-frame.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-frame.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.conn + Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.conn Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-summary.html URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff ============================================================================== --- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-summary.html (original) +++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-summary.html Thu Nov 6 14:29:37 2014 @@ -3,7 +3,7 @@ - Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.conn + Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.conn