https to https fallback

Author: leijurv

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - The ability to override CLI argument defaults from a properties file in the jar. This means the Donator Installer can be generated dynamically by the website.
+- A fallback from unauthenticated HTTPS to HTTPS. I do not understand why, but it made it work for someone.
 
 ## [0.8.3] - 2020-02-21
 

src/main/java/io/github/ImpactDevelopment/installer/Args.java

@@ -178,14 +178,14 @@ private static Properties getProperties(String filename) throws IOException {
 
     // Convert a string value to a primitive type
     // Won't work for non-primitive types, but luckily all our args are primitives
-    private static Object toType(Class<?> type, String value ) {
-        if(Boolean.class == type || Boolean.TYPE == type) return Boolean.parseBoolean(value);
-        if(Byte.class == type || Byte.TYPE == type) return Byte.parseByte(value);
-        if(Short.class == type || Short.TYPE == type) return Short.parseShort(value);
-        if(Integer.class == type || Integer.TYPE == type) return Integer.parseInt(value);
-        if(Long.class == type || Long.TYPE == type) return Long.parseLong(value);
-        if(Float.class == type || Float.TYPE == type) return Float.parseFloat(value);
-        if(Double.class == type || Double.TYPE == type) return Double.parseDouble(value);
+    private static Object toType(Class<?> type, String value) {
+        if (Boolean.class == type || Boolean.TYPE == type) return Boolean.parseBoolean(value);
+        if (Byte.class == type || Byte.TYPE == type) return Byte.parseByte(value);
+        if (Short.class == type || Short.TYPE == type) return Short.parseShort(value);
+        if (Integer.class == type || Integer.TYPE == type) return Integer.parseInt(value);
+        if (Long.class == type || Long.TYPE == type) return Long.parseLong(value);
+        if (Float.class == type || Float.TYPE == type) return Float.parseFloat(value);
+        if (Double.class == type || Double.TYPE == type) return Double.parseDouble(value);
         return value;
     }
 }

src/main/java/io/github/ImpactDevelopment/installer/utils/Fetcher.java

@@ -25,9 +25,7 @@
 import org.apache.commons.io.IOUtils;
 
 import javax.net.ssl.*;
-import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
@@ -44,17 +42,28 @@ public static String fetch(String url) {
     public static byte[] fetchBytes(String url) {
         SSLSocketFactory originalSSL = HttpsURLConnection.getDefaultSSLSocketFactory(); // for restoring later
         HostnameVerifier originalHost = HttpsURLConnection.getDefaultHostnameVerifier();
-        try {
-            disableAllVerification();
-        } catch (Throwable th) {
-            System.out.println("Unable to disable https");
-            th.printStackTrace();
-        }
         System.out.println("DOWNLOADING " + url);
         try {
-            return IOUtils.toByteArray(new URI(url));
-        } catch (IOException | URISyntaxException e) {
-            throw new RuntimeException("Unable to fetch " + url, e);
+            try {
+                return IOUtils.toByteArray(new URI(url));
+            } catch (Throwable th) {
+                th.printStackTrace();
+            }
+            disableHTTPSPart1();
+            try {
+                return IOUtils.toByteArray(new URI(url));
+            } catch (Throwable th) {
+                th.printStackTrace();
+            }
+            disableHTTPSPart2();
+            try {
+                return IOUtils.toByteArray(new URI(url));
+            } catch (Throwable th) {
+                th.printStackTrace();
+                throw new RuntimeException("Unable to fetch " + url, th);
+            }
+        } catch (NoSuchAlgorithmException | KeyManagementException e) {
+            throw new RuntimeException(e);
         } finally {
             try {
                 HttpsURLConnection.setDefaultSSLSocketFactory(originalSSL); // restore to full https verification
@@ -65,7 +74,7 @@ public static byte[] fetchBytes(String url) {
         }
     }
 
-    public static void disableAllVerification() throws NoSuchAlgorithmException, KeyManagementException {
+    public static void disableHTTPSPart1() throws NoSuchAlgorithmException, KeyManagementException {
         TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
             public java.security.cert.X509Certificate[] getAcceptedIssuers() {
                 return null;
@@ -79,14 +88,10 @@ public void checkServerTrusted(X509Certificate[] certs, String authType) {
         }};
         SSLContext sc = SSLContext.getInstance("SSL");
         sc.init(null, trustAllCerts, new java.security.SecureRandom());
-        SSLSocketFactory allSSLValid = sc.getSocketFactory();
-        HostnameVerifier allHostsValid = new HostnameVerifier() {
-            public boolean verify(String hostname, SSLSession session) {
-                return true;
-            }
-        };
+        HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+    }
 
-        HttpsURLConnection.setDefaultSSLSocketFactory(allSSLValid);
-        HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
+    public static void disableHTTPSPart2() {
+        HttpsURLConnection.setDefaultHostnameVerifier((hostname, session) -> true);
     }
 }