Make sure that SSL can be re-enabled

Author: artemlos

src/main/java/io/cryptolens/internal/HelperMethods.java

@@ -66,30 +66,6 @@ public static <T extends BasicResult> T SendRequestToWebAPI(String method, Reque
         RequestHandler requestHandler = new HttpsURLConnectionRequestHandler();
 
         try {
-            if(!HelperMethods.SSLVerifyEnabled) {
-                HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
-                    public boolean verify(String hostname, SSLSession session) {
-                        return true;
-                    }
-                });
-                SSLContext context = SSLContext.getInstance("TLS");
-                context.init(null, new X509TrustManager[]{new X509TrustManager() {
-                    public void checkClientTrusted(X509Certificate[] chain,
-                                                   String authType) throws CertificateException {
-                    }
-
-                    public void checkServerTrusted(X509Certificate[] chain,
-                                                   String authType) throws CertificateException {
-                    }
-
-                    public X509Certificate[] getAcceptedIssuers() {
-                        return new X509Certificate[0];
-                    }
-                }}, new SecureRandom());
-                HttpsURLConnection.setDefaultSSLSocketFactory(
-                        context.getSocketFactory());
-            }
-
             String response = requestHandler.makePostRequest(licenseServerUrl + "/api/" + method, params);
 
             Gson gson = new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new JsonDeserializer<LocalDateTime>() {

src/main/java/io/cryptolens/legacy/HttpsURLConnectionRequestHandler.java

@@ -1,7 +1,13 @@
 package io.cryptolens.legacy;
 
+import io.cryptolens.internal.HelperMethods;
+import sun.net.util.URLUtil;
+
 import java.io.*;
 import java.net.*;
+import java.security.SecureRandom;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
 import java.util.*;
 
 import javax.net.ssl.*;
@@ -12,6 +18,33 @@ public String makePostRequest(String url, Map<String,String> params) throws Exce
 
     // HttpsURLConnection extends HttpURLConnection
     HttpURLConnection connection = (HttpURLConnection)url_.openConnection();
+
+    if(!HelperMethods.SSLVerifyEnabled && "https".equals(url_.getProtocol())){
+
+      SSLContext context = SSLContext.getInstance("TLS");
+      context.init(null, new X509TrustManager[]{new X509TrustManager() {
+        public void checkClientTrusted(X509Certificate[] chain,
+                                       String authType) throws CertificateException {
+        }
+
+        public void checkServerTrusted(X509Certificate[] chain,
+                                       String authType) throws CertificateException {
+        }
+
+        public X509Certificate[] getAcceptedIssuers() {
+          return new X509Certificate[0];
+        }
+      }}, new SecureRandom());
+
+      ((HttpsURLConnection)connection).setHostnameVerifier(new HostnameVerifier() {
+        public boolean verify(String hostname, SSLSession session) {
+          return true;
+        }
+      });
+
+      ((HttpsURLConnection)connection).setSSLSocketFactory(context.getSocketFactory());
+    }
+
     connection.setRequestMethod("POST");
 
     connection.setDoOutput(true);