From d2772697f306ddd7d72c096b5e04a4cd67da91f6 Mon Sep 17 00:00:00 2001 From: 33 Date: Fri, 15 Dec 2023 17:39:36 +0800 Subject: [PATCH] feat: remove forceIgnoreHttpsCertificate for security --- .../java/customskinloader/config/Config.java | 3 --- .../customskinloader/utils/HttpUtil0.java | 27 ------------------- build.properties | 2 +- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/Common/src/main/java/customskinloader/config/Config.java b/Common/src/main/java/customskinloader/config/Config.java index b8f1ae3..8d84398 100644 --- a/Common/src/main/java/customskinloader/config/Config.java +++ b/Common/src/main/java/customskinloader/config/Config.java @@ -24,7 +24,6 @@ public class Config { //Function public boolean enableDynamicSkull = true; public boolean enableTransparentSkin = true; - public boolean forceIgnoreHttpsCertificate = false; public boolean forceLoadAllTextures = true; public boolean enableCape = true; public int threadPoolSize = 8; @@ -76,8 +75,6 @@ public class Config { config.updateLoadlist(); config.initLocalFolder(); config.threadPoolSize = Math.max(config.threadPoolSize, 1); - if (config.forceIgnoreHttpsCertificate) - HttpUtil0.ignoreHttpsCertificate(); if (config.enableCacheAutoClean && !config.enableLocalProfileCache) { try { FileUtils.deleteDirectory(HttpRequestUtil.CACHE_DIR); diff --git a/Common/src/main/java/customskinloader/utils/HttpUtil0.java b/Common/src/main/java/customskinloader/utils/HttpUtil0.java index d744c5b..8239170 100644 --- a/Common/src/main/java/customskinloader/utils/HttpUtil0.java +++ b/Common/src/main/java/customskinloader/utils/HttpUtil0.java @@ -20,33 +20,6 @@ public class HttpUtil0 { return url != null && !url.startsWith("http://") && !url.startsWith("https://"); } - //From: http://blog.csdn.net/xiyushiyi/article/details/46685387 - public static void ignoreHttpsCertificate(){ - HostnameVerifier doNotVerify = new HostnameVerifier() { - - public boolean verify(String hostname, SSLSession session) { - return true; - } - }; - TrustManager[] trustAllCerts = new TrustManager[] {new X509TrustManager() { - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[] {}; - } - public void checkClientTrusted(X509Certificate[] chain, String authType){} - public void checkServerTrusted(X509Certificate[] chain, String authType){} - }}; - - try { - SSLContext sc = SSLContext.getInstance("TLS"); - sc.init(null, trustAllCerts, new java.security.SecureRandom()); - //HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory()); - HttpsURLConnection.setDefaultSSLSocketFactory(new SSLSocketFactoryFacade()); - HttpsURLConnection.setDefaultHostnameVerifier(doNotVerify); - } catch (Exception e) { - e.printStackTrace(); - } - } - public static String parseAddress(String address) { if(StringUtils.isEmpty(address)) return null; diff --git a/build.properties b/build.properties index 1474fea..76d8e9b 100644 --- a/build.properties +++ b/build.properties @@ -1,3 +1,3 @@ name=CustomSkinLoader group=customskinloader -version=14.19 +version=14.19.1