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 7DA61171EE for ; Sat, 11 Oct 2014 20:01:55 +0000 (UTC) Received: (qmail 83953 invoked by uid 500); 11 Oct 2014 20:01:55 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 83910 invoked by uid 500); 11 Oct 2014 20:01:55 -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 83900 invoked by uid 99); 11 Oct 2014 20:01:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Oct 2014 20:01:55 +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; Sat, 11 Oct 2014 20:01:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 060352388999 for ; Sat, 11 Oct 2014 20:01:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1631106 - in /httpcomponents/httpclient/trunk/httpclient/src: main/java/org/apache/http/conn/ssl/DefaultHostnameVerifier.java test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java Date: Sat, 11 Oct 2014 20:01:33 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141011200134.060352388999@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Sat Oct 11 20:01:33 2014 New Revision: 1631106 URL: http://svn.apache.org/r1631106 Log: Do not run public suffix test on simple host names (non DNS names) Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/DefaultHostnameVerifier.java httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/DefaultHostnameVerifier.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/DefaultHostnameVerifier.java?rev=1631106&r1=1631105&r2=1631106&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/DefaultHostnameVerifier.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/DefaultHostnameVerifier.java Sat Oct 11 20:01:33 2014 @@ -173,7 +173,7 @@ public final class DefaultHostnameVerifi return false; } - if (publicSuffixMatcher != null) { + if (publicSuffixMatcher != null && host.contains(".")) { String domainRoot = publicSuffixMatcher.getDomainRoot(identity); if (domainRoot == null) { // Public domain Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java?rev=1631106&r1=1631105&r2=1631106&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java Sat Oct 11 20:01:33 2014 @@ -110,6 +110,30 @@ public class TestSSLSocketFactory { } @Test + public void testBasicDefaultHostnameVerifier() throws Exception { + this.server = ServerBootstrap.bootstrap() + .setServerInfo(LocalServerTestBase.ORIGIN) + .setSslContext(SSLTestContexts.createServerSSLContext()) + .create(); + this.server.start(); + + final HttpContext context = new BasicHttpContext(); + final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory( + SSLTestContexts.createClientSSLContext(), SSLConnectionSocketFactory.getDefaultHostnameVerifier()); + final Socket socket = socketFactory.createSocket(context); + final InetSocketAddress remoteAddress = new InetSocketAddress("localhost", this.server.getLocalPort()); + final HttpHost target = new HttpHost("localhost", this.server.getLocalPort(), "https"); + final SSLSocket sslSocket = (SSLSocket) socketFactory.connectSocket(0, socket, target, remoteAddress, null, context); + try { + final SSLSession sslsession = sslSocket.getSession(); + + Assert.assertNotNull(sslsession); + } finally { + sslSocket.close(); + } + } + + @Test public void testClientAuthSSL() throws Exception { this.server = ServerBootstrap.bootstrap() .setServerInfo(LocalServerTestBase.ORIGIN) @@ -178,6 +202,8 @@ public class TestSSLSocketFactory { }; + + this.server = ServerBootstrap.bootstrap() .setServerInfo(LocalServerTestBase.ORIGIN) .setSslContext(SSLTestContexts.createServerSSLContext())