allow setting a custom HostNameVerifier for issue #322

Kong · Dec 6, 2019 · 41f9132 · 41f9132
1 parent 493b173
commit 41f9132
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/unirest/src/main/java/kong/unirest/Config.java b/unirest/src/main/java/kong/unirest/Config.java
@@ -31,6 +31,7 @@
 import org.apache.http.client.HttpClient;
 import org.apache.http.nio.client.HttpAsyncClient;
 
+import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -84,6 +85,7 @@ public class Config {
     private long ttl = -1;
     private SSLContext sslContext;
     private Interceptor interceptor = new DefaultInterceptor();
+    private HostnameVerifier hostnameVerifier;
 
     public Config() {
         setDefaults();
@@ -243,6 +245,16 @@ public Config sslContext(SSLContext ssl) {
         return this;
     }
 
+    /**
+     * Set a custom HostnameVerifier
+     * @param value the verifier
+     * @return this config object
+     */
+    public Config hostnameVerifier(HostnameVerifier value) {
+        this.hostnameVerifier = value;
+        return this;
+    }
+
     private void verifySecurityConfig(Object thing) {
         if(thing != null){
             throw new UnirestConfigException("You may only configure a SSLContext OR a Keystore, but not both");
@@ -813,4 +825,8 @@ public SSLContext getSslContext() {
     private Optional<DefaultInterceptor> getDefaultInterceptor() {
         return tryCast(getUniInterceptor(), DefaultInterceptor.class);
     }
+
+    public HostnameVerifier getHostnameVerifier() {
+        return hostnameVerifier;
+    }
 }
diff --git a/unirest/src/main/java/kong/unirest/apache/SecurityConfig.java b/unirest/src/main/java/kong/unirest/apache/SecurityConfig.java
@@ -39,6 +39,7 @@
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.ssl.SSLContexts;
 
+import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -104,10 +105,18 @@ private Registry<ConnectionSocketFactory> createDisabledSSLContext() throws Exce
 
     private SSLConnectionSocketFactory getSocketFactory() {
         if(sslSocketFactory == null) {
-            sslSocketFactory = new SSLConnectionSocketFactory(createSslContext(), new NoopHostnameVerifier());
+            sslSocketFactory = new SSLConnectionSocketFactory(createSslContext(), getHostnameVerifier());
         }
         return sslSocketFactory;
     }
+
+    private HostnameVerifier getHostnameVerifier() {
+        if(config.getHostnameVerifier() != null){
+            return config.getHostnameVerifier();
+        }
+        return NoopHostnameVerifier.INSTANCE;
+    }
+
     private SSLContext createSslContext() {
         if(sslContext == null) {
             if(config.getSslContext() != null){

diff --git a/unirest/src/test/java/BehaviorTests/CertificateTests.java b/unirest/src/test/java/BehaviorTests/CertificateTests.java
@@ -90,6 +90,14 @@ public void loadWithSSLContext() throws Exception {
         assertEquals(200, response);
     }
 
+    @Test
+    public void canSetHoestNameVerifyer() throws Exception {
+        Unirest.config().hostnameVerifier(new NoopHostnameVerifier());
+
+        int response = Unirest.get("https://badssl.com/").asEmpty().getStatus();
+        assertEquals(200, response);
+    }
+
     @Test
     public void rawApacheClientCert() throws Exception {
         SSLContext sslContext = SSLContexts.custom()