Rename AcceptAnyCertificate config option into UseInsecureTrustManager, close AsyncHttpClient#1312

Author: slandelle

client/src/main/java/org/asynchttpclient/AsyncHttpClientConfig.java

@@ -210,7 +210,7 @@ public interface AsyncHttpClientConfig {
 
     boolean isUseOpenSsl();
 
-    boolean isAcceptAnyCertificate();
+    boolean isUseInsecureTrustManager();
 
     /**
      * @return the array of enabled protocols

client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClientConfig.java

@@ -95,7 +95,7 @@ public class DefaultAsyncHttpClientConfig implements AsyncHttpClientConfig {
 
     // ssl
     private final boolean useOpenSsl;
-    private final boolean acceptAnyCertificate;
+    private final boolean useInsecureTrustManager;
     private final int handshakeTimeout;
     private final String[] enabledProtocols;
     private final String[] enabledCipherSuites;
@@ -167,7 +167,7 @@ private DefaultAsyncHttpClientConfig(//
 
             // ssl
             boolean useOpenSsl,//
-            boolean acceptAnyCertificate,//
+            boolean useInsecureTrustManager,//
             int handshakeTimeout,//
             String[] enabledProtocols,//
             String[] enabledCipherSuites,//
@@ -240,7 +240,7 @@ private DefaultAsyncHttpClientConfig(//
 
         // ssl
         this.useOpenSsl = useOpenSsl;
-        this.acceptAnyCertificate = acceptAnyCertificate;
+        this.useInsecureTrustManager = useInsecureTrustManager;
         this.handshakeTimeout = handshakeTimeout;
         this.enabledProtocols = enabledProtocols;
         this.enabledCipherSuites = enabledCipherSuites;
@@ -422,8 +422,8 @@ public boolean isUseOpenSsl() {
     }
 
     @Override
-    public boolean isAcceptAnyCertificate() {
-        return acceptAnyCertificate;
+    public boolean isUseInsecureTrustManager() {
+        return useInsecureTrustManager;
     }
 
     @Override
@@ -629,7 +629,7 @@ public static class Builder {
 
         // ssl
         private boolean useOpenSsl = defaultUseOpenSsl();
-        private boolean acceptAnyCertificate = defaultAcceptAnyCertificate();
+        private boolean useInsecureTrustManager = defaultUseInsecureTrustManager();
         private int handshakeTimeout = defaultHandshakeTimeout();
         private String[] enabledProtocols = defaultEnabledProtocols();
         private String[] enabledCipherSuites = defaultEnabledCipherSuites();
@@ -703,7 +703,7 @@ public Builder(AsyncHttpClientConfig config) {
             keepAliveStrategy = config.getKeepAliveStrategy();
 
             // ssl
-            acceptAnyCertificate = config.isAcceptAnyCertificate();
+            useInsecureTrustManager = config.isUseInsecureTrustManager();
             handshakeTimeout = config.getHandshakeTimeout();
             enabledProtocols = config.getEnabledProtocols();
             enabledCipherSuites = config.getEnabledCipherSuites();
@@ -897,8 +897,8 @@ public Builder setUseOpenSsl(boolean useOpenSsl) {
             return this;
         }
 
-        public Builder setAcceptAnyCertificate(boolean acceptAnyCertificate) {
-            this.acceptAnyCertificate = acceptAnyCertificate;
+        public Builder setUseInsecureTrustManager(boolean useInsecureTrustManager) {
+            this.useInsecureTrustManager = useInsecureTrustManager;
             return this;
         }
 
@@ -1123,7 +1123,7 @@ public DefaultAsyncHttpClientConfig build() {
                     channelPool, //
                     keepAliveStrategy, //
                     useOpenSsl, //
-                    acceptAnyCertificate, //
+                    useInsecureTrustManager, //
                     handshakeTimeout, //
                     enabledProtocols, //
                     enabledCipherSuites, //

client/src/main/java/org/asynchttpclient/config/AsyncHttpClientConfigDefaults.java

@@ -118,8 +118,8 @@ public static boolean defaultUseOpenSsl() {
         return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getBoolean(ASYNC_CLIENT_CONFIG_ROOT + "useOpenSsl");
     }
 
-    public static boolean defaultAcceptAnyCertificate() {
-        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getBoolean(ASYNC_CLIENT_CONFIG_ROOT + "acceptAnyCertificate");
+    public static boolean defaultUseInsecureTrustManager() {
+        return AsyncHttpClientConfigHelper.getAsyncHttpClientConfig().getBoolean(ASYNC_CLIENT_CONFIG_ROOT + "useInsecureTrustManager");
     }
 
     public static int defaultSslSessionCacheSize() {

client/src/main/java/org/asynchttpclient/netty/handler/WebSocketHandler.java

@@ -84,7 +84,6 @@ private void invokeOnSucces(Channel channel, WebSocketUpgradeHandler h) {
 
         @Override
         public void call() throws Exception {
-
             boolean validStatus = response.status().equals(SWITCHING_PROTOCOLS);
             boolean validUpgrade = response.headers().get(UPGRADE) != null;
             String connection = response.headers().get(CONNECTION);

client/src/main/java/org/asynchttpclient/netty/ssl/DefaultSslEngineFactory.java

@@ -36,8 +36,9 @@ private SslContext buildSslContext(AsyncHttpClientConfig config) throws SSLExcep
                 .sessionCacheSize(config.getSslSessionCacheSize())//
                 .sessionTimeout(config.getSslSessionTimeout());
 
-        if (config.isAcceptAnyCertificate())
+        if (config.isUseInsecureTrustManager()) {
             sslContextBuilder.trustManager(InsecureTrustManagerFactory.INSTANCE);
+        }
 
         return configureSslContextBuilder(sslContextBuilder).build();
     }

client/src/main/resources/ahc-default.properties

@@ -22,7 +22,7 @@ org.asynchttpclient.maxRequestRetry=5
 org.asynchttpclient.disableUrlEncodingForBoundRequests=false
 org.asynchttpclient.removeQueryParamOnRedirect=true
 org.asynchttpclient.useOpenSsl=false
-org.asynchttpclient.acceptAnyCertificate=false
+org.asynchttpclient.useInsecureTrustManager=false
 org.asynchttpclient.sslSessionCacheSize=0
 org.asynchttpclient.sslSessionTimeout=0
 org.asynchttpclient.tcpNoDelay=true

client/src/test/java/org/asynchttpclient/AsyncHttpClientDefaultsTest.java

@@ -110,9 +110,9 @@ public void testDefaultDisableUrlEncodingForBoundRequests() {
         testBooleanSystemProperty("disableUrlEncodingForBoundRequests", "defaultDisableUrlEncodingForBoundRequests", "true");
     }
 
-    public void testDefaultAcceptAnyCertificate() {
-        Assert.assertFalse(AsyncHttpClientConfigDefaults.defaultAcceptAnyCertificate());
-        testBooleanSystemProperty("acceptAnyCertificate", "defaultAcceptAnyCertificate", "true");
+    public void testDefaultUseInsecureTrustManager() {
+        Assert.assertFalse(AsyncHttpClientConfigDefaults.defaultUseInsecureTrustManager());
+        testBooleanSystemProperty("useInsecureTrustManager", "defaultUseInsecureTrustManager", "false");
     }
 
     private void testIntegerSystemProperty(String propertyName, String methodName, String value) {

client/src/test/java/org/asynchttpclient/BasicHttpProxyToHttpsTest.java

@@ -93,7 +93,7 @@ public void tearDownGlobal() throws Exception {
 
     @Test
     public void nonPreemptyProxyAuthWithHttpsTarget() throws IOException, InterruptedException, ExecutionException {
-        try (AsyncHttpClient client = asyncHttpClient(config().setAcceptAnyCertificate(true))) {
+        try (AsyncHttpClient client = asyncHttpClient(config().setUseInsecureTrustManager(true))) {
             String targetUrl = "https://localhost:" + httpPort + "/foo/bar";
             Request request = get(targetUrl)//
                     .setProxyServer(proxyServer("127.0.0.1", proxyPort).setRealm(realm(AuthScheme.BASIC, "johndoe", "pass")))//

client/src/test/java/org/asynchttpclient/HttpToHttpsRedirectTest.java

@@ -96,7 +96,7 @@ public void httpToHttpsRedirect() throws Exception {
         AsyncHttpClientConfig cg = config()//
                 .setMaxRedirects(5)//
                 .setFollowRedirect(true)//
-                .setAcceptAnyCertificate(true)//
+                .setUseInsecureTrustManager(true)//
                 .build();
         try (AsyncHttpClient c = asyncHttpClient(cg)) {
             Response response = c.prepareGet(getTargetUrl()).setHeader("X-redirect", getTargetUrl2()).execute().get();
@@ -113,7 +113,7 @@ public void httpToHttpsProperConfig() throws Exception {
         AsyncHttpClientConfig cg = config()//
                 .setMaxRedirects(5)//
                 .setFollowRedirect(true)//
-                .setAcceptAnyCertificate(true)//
+                .setUseInsecureTrustManager(true)//
                 .build();
         try (AsyncHttpClient c = asyncHttpClient(cg)) {
             Response response = c.prepareGet(getTargetUrl()).setHeader("X-redirect", getTargetUrl2() + "/test2").execute().get();
@@ -136,7 +136,7 @@ public void relativeLocationUrl() throws Exception {
         AsyncHttpClientConfig cg = config()//
                 .setMaxRedirects(5)//
                 .setFollowRedirect(true)//
-                .setAcceptAnyCertificate(true)//
+                .setUseInsecureTrustManager(true)//
                 .build();
         try (AsyncHttpClient c = asyncHttpClient(cg)) {
             Response response = c.prepareGet(getTargetUrl()).setHeader("X-redirect", "/foo/test").execute().get();

client/src/test/java/org/asynchttpclient/proxy/HttpsProxyTest.java

@@ -67,7 +67,7 @@ public void tearDownGlobal() throws Exception {
     @Test(groups = "standalone")
     public void testRequestProxy() throws Exception {
 
-        try (AsyncHttpClient asyncHttpClient = asyncHttpClient(config().setFollowRedirect(true).setAcceptAnyCertificate(true))) {
+        try (AsyncHttpClient asyncHttpClient = asyncHttpClient(config().setFollowRedirect(true).setUseInsecureTrustManager(true))) {
             RequestBuilder rb = get(getTargetUrl2()).setProxyServer(proxyServer("localhost", port1));
             Response r = asyncHttpClient.executeRequest(rb.build()).get();
             assertEquals(r.getStatusCode(), 200);
@@ -79,7 +79,7 @@ public void testConfigProxy() throws Exception {
         AsyncHttpClientConfig config = config()//
                 .setFollowRedirect(true)//
                 .setProxyServer(proxyServer("localhost", port1).build())//
-                .setAcceptAnyCertificate(true)//
+                .setUseInsecureTrustManager(true)//
                 .build();
         try (AsyncHttpClient asyncHttpClient = asyncHttpClient(config)) {
             Response r = asyncHttpClient.executeRequest(get(getTargetUrl2())).get();
@@ -90,7 +90,7 @@ public void testConfigProxy() throws Exception {
     @Test(groups = "standalone")
     public void testPooledConnectionsWithProxy() throws Exception {
 
-        try (AsyncHttpClient asyncHttpClient = asyncHttpClient(config().setFollowRedirect(true).setAcceptAnyCertificate(true).setKeepAlive(true))) {
+        try (AsyncHttpClient asyncHttpClient = asyncHttpClient(config().setFollowRedirect(true).setUseInsecureTrustManager(true).setKeepAlive(true))) {
             RequestBuilder rb = get(getTargetUrl2()).setProxyServer(proxyServer("localhost", port1));
 
             Response r1 = asyncHttpClient.executeRequest(rb.build()).get();

client/src/test/java/org/asynchttpclient/ws/ProxyTunnellingTest.java

@@ -87,7 +87,7 @@ private void runTest(boolean secure) throws Exception {
 
         // CONNECT happens over HTTP, not HTTPS
         ProxyServer ps = proxyServer("localhost", port1).build();
-        try (AsyncHttpClient asyncHttpClient = asyncHttpClient(config().setProxyServer(ps).setAcceptAnyCertificate(true))) {
+        try (AsyncHttpClient asyncHttpClient = asyncHttpClient(config().setProxyServer(ps).setUseInsecureTrustManager(true))) {
             final CountDownLatch latch = new CountDownLatch(1);
             final AtomicReference<String> text = new AtomicReference<>("");
 

extras/simple/src/main/java/org/asynchttpclient/extras/simple/SimpleAsyncHttpClient.java

@@ -648,7 +648,7 @@ public Builder setMaxRequestRetry(int maxRequestRetry) {
         }
 
         public Builder setAcceptAnyCertificate(boolean acceptAnyCertificate) {
-            configBuilder.setAcceptAnyCertificate(acceptAnyCertificate);
+            configBuilder.setUseInsecureTrustManager(acceptAnyCertificate);
             return this;
         }