Make acceptAnyCertificate doesn't disable HostnameVerifier, close #649

Author: Stephane Landelle

src/main/java/com/ning/http/client/AsyncHttpClientConfig.java

@@ -21,6 +21,7 @@
 import com.ning.http.client.filter.IOExceptionFilter;
 import com.ning.http.client.filter.RequestFilter;
 import com.ning.http.client.filter.ResponseFilter;
+import com.ning.http.util.DefaultHostnameVerifier;
 import com.ning.http.util.ProxyUtils;
 
 import javax.net.ssl.HostnameVerifier;
@@ -231,7 +232,7 @@ public int getMaxRedirects() {
     }
 
     /**
-     * Is the {@link ChannelPool} support enabled.
+     * Is pooling connections enabled.
      *
      * @return if polling connections is enabled
      */
@@ -463,7 +464,7 @@ public static class Builder {
         private int pooledConnectionIdleTimeout = defaultPooledConnectionIdleTimeout();
         private int connectionTTL = defaultConnectionTTL();
         private SSLContext sslContext;
-        private HostnameVerifier hostnameVerifier = defaultHostnameVerifier();
+        private HostnameVerifier hostnameVerifier;
         private boolean acceptAnyCertificate = defaultAcceptAnyCertificate();
         private boolean followRedirect = defaultFollowRedirect();
         private int maxRedirects = defaultMaxRedirects();
@@ -961,17 +962,19 @@ public Thread newThread(Runnable r) {
                 });
             }
 
-            if (proxyServerSelector == null && useProxySelector) {
+            if (proxyServerSelector == null && useProxySelector)
                 proxyServerSelector = ProxyUtils.getJdkDefaultProxyServerSelector();
-            }
 
-            if (proxyServerSelector == null && useProxyProperties) {
+            if (proxyServerSelector == null && useProxyProperties)
                 proxyServerSelector = ProxyUtils.createProxyServerSelector(System.getProperties());
-            }
 
-            if (proxyServerSelector == null) {
+            if (proxyServerSelector == null)
                 proxyServerSelector = ProxyServerSelector.NO_PROXY_SELECTOR;
-            }
+
+            if (acceptAnyCertificate)
+                hostnameVerifier = null;
+            else if (hostnameVerifier == null)
+                hostnameVerifier = new DefaultHostnameVerifier();
 
             return new AsyncHttpClientConfig(connectionTimeout,//
                     maxConnections,//

src/main/java/com/ning/http/client/AsyncHttpClientConfigBean.java

@@ -65,7 +65,6 @@ void configureDefaults() {
         disableUrlEncodingForBoundRequests = defaultDisableUrlEncodingForBoundRequests();
         removeQueryParamOnRedirect = defaultRemoveQueryParamOnRedirect();
         strict302Handling = defaultStrict302Handling();
-        hostnameVerifier = defaultHostnameVerifier();
         acceptAnyCertificate = defaultAcceptAnyCertificate();
 
         if (defaultUseProxySelector()) {

src/main/java/com/ning/http/client/AsyncHttpClientConfigDefaults.java

@@ -14,10 +14,6 @@
 
 import static com.ning.http.util.MiscUtils.getBoolean;
 
-import com.ning.http.util.DefaultHostnameVerifier;
-
-import javax.net.ssl.HostnameVerifier;
-
 public final class AsyncHttpClientConfigDefaults {
 
     private AsyncHttpClientConfigDefaults() {
@@ -112,10 +108,6 @@ public static boolean defaultDisableUrlEncodingForBoundRequests() {
     public static boolean defaultRemoveQueryParamOnRedirect() {
         return getBoolean(ASYNC_CLIENT + "removeQueryParamOnRedirect", true);
     }
-
-    public static HostnameVerifier defaultHostnameVerifier() {
-        return new DefaultHostnameVerifier();
-    }
 
     public static boolean defaultAcceptAnyCertificate() {
         return getBoolean(ASYNC_CLIENT + "acceptAnyCertificate", false);