From 76c254ee980ea32ed9e39c565c3cd45fe8083cd2 Mon Sep 17 00:00:00 2001 From: andylizi Date: Wed, 28 Feb 2018 17:23:49 +0800 Subject: [PATCH] Switch the download links to HTTPS --- HMCL/src/main/java/org/jackhuang/hmcl/Main.java | 2 +- .../org/jackhuang/hmcl/upgrade/UpdateChecker.java | 4 ++-- .../java/org/jackhuang/hmcl/util/CrashReporter.java | 2 +- .../hmcl/download/BMCLAPIDownloadProvider.java | 12 ++++++------ .../hmcl/download/CurseCDNDownloadProvider.java | 2 +- .../hmcl/download/MojangDownloadProvider.java | 12 ++++++------ .../hmcl/download/forge/ForgeVersionList.java | 3 +-- .../download/optifine/OptiFineBMCLVersionList.java | 5 ++--- .../hmcl/download/optifine/OptiFineVersionList.java | 4 ++-- .../main/java/org/jackhuang/hmcl/util/Constants.java | 5 ++--- 10 files changed, 24 insertions(+), 27 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java index ed16b143a..47259d278 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java @@ -139,6 +139,6 @@ public final class Main extends Application { public static final IUpgrader UPGRADER = new AppDataUpgrader(); public static final CrashReporter CRASH_REPORTER = new CrashReporter(); - public static final String CONTACT = "http://huangyuhui.duapp.com/hmcl.php"; + public static final String CONTACT = "https://huangyuhui.duapp.com/hmcl.php"; public static final String PUBLISH = "http://www.mcbbs.net/thread-142335-1-1.html"; } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java index 9e209b655..2fc852dbd 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java @@ -71,7 +71,7 @@ public final class UpdateChecker { return; if (value == null) { - versionString = NetworkUtils.doGet(NetworkUtils.toURL("http://huangyuhui.duapp.com/hmcl/update.php?version=" + Main.VERSION)); + versionString = NetworkUtils.doGet(NetworkUtils.toURL("https://huangyuhui.duapp.com/hmcl/update.php?version=" + Main.VERSION)); value = VersionNumber.asVersion(versionString); } @@ -115,7 +115,7 @@ public final class UpdateChecker { public void execute() { if (download_link == null) try { - download_link = Constants.GSON.>fromJson(NetworkUtils.doGet(NetworkUtils.toURL("http://huangyuhui.duapp.com/update_link.php?type=hmcl")), Map.class); + download_link = Constants.GSON.>fromJson(NetworkUtils.doGet(NetworkUtils.toURL("https://huangyuhui.duapp.com/update_link.php?type=hmcl")), Map.class); } catch (JsonSyntaxException | IOException e) { Logging.LOG.log(Level.SEVERE, "Failed to get update link.", e); } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java index b927743f8..594997994 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java @@ -112,7 +112,7 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler { map.put("crash_report", text); map.put("version", Main.VERSION); try { - String response = NetworkUtils.doPost(NetworkUtils.toURL("http://huangyuhui.duapp.com/hmcl/crash.php"), map); + String response = NetworkUtils.doPost(NetworkUtils.toURL("https://huangyuhui.duapp.com/hmcl/crash.php"), map); if (StringUtils.isNotBlank(response)) Logging.LOG.log(Level.SEVERE, "Crash server response: " + response); } catch (IOException ex) { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java index 8f2e2da3b..36ae08186 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java @@ -35,27 +35,27 @@ public class BMCLAPIDownloadProvider implements DownloadProvider { @Override public String getLibraryBaseURL() { - return "http://bmclapi2.bangbang93.com/libraries/"; + return "https://bmclapi2.bangbang93.com/libraries/"; } @Override public String getVersionListURL() { - return "http://bmclapi2.bangbang93.com/mc/game/version_manifest.json"; + return "https://bmclapi2.bangbang93.com/mc/game/version_manifest.json"; } @Override public String getVersionBaseURL() { - return "http://bmclapi2.bangbang93.com/versions/"; + return "https://bmclapi2.bangbang93.com/versions/"; } @Override public String getAssetIndexBaseURL() { - return "http://bmclapi2.bangbang93.com/indexes/"; + return "https://bmclapi2.bangbang93.com/indexes/"; } @Override public String getAssetBaseURL() { - return "http://bmclapi2.bangbang93.com/assets/"; + return "https://bmclapi2.bangbang93.com/assets/"; } @Override @@ -80,7 +80,7 @@ public class BMCLAPIDownloadProvider implements DownloadProvider { .replace("https://launchermeta.mojang.com", "https://bmclapi2.bangbang93.com") .replace("https://launcher.mojang.com", "https://bmclapi2.bangbang93.com") .replace("https://libraries.minecraft.net", "https://bmclapi2.bangbang93.com/libraries") - .replace("http://files.minecraftforge.net/maven", "https://bmclapi2.bangbang93.com/maven") + .replaceFirst("https?://files\\.minecraftforge\\.net/maven", "https://bmclapi2.bangbang93.com/maven") .replace("http://dl.liteloader.com/versions/versions.json", "https://bmclapi2.bangbang93.com/maven/com/mumfrey/liteloader/versions.json") .replace("http://dl.liteloader.com/versions", "https://bmclapi2.bangbang93.com/maven"); } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/CurseCDNDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/CurseCDNDownloadProvider.java index d4f4b92fe..ece53bf94 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/CurseCDNDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/CurseCDNDownloadProvider.java @@ -26,6 +26,6 @@ public class CurseCDNDownloadProvider extends MojangDownloadProvider { @Override public String injectURL(String baseURL) { - return baseURL == null ? null : baseURL.replace("http://files.minecraftforge.net/maven", "http://ftb.cursecdn.com/FTB2/maven"); + return baseURL == null ? null : baseURL.replaceFirst("https?://files\\.minecraftforge\\.net/maven", "https://ftb.cursecdn.com/FTB2/maven"); } } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java index 45d897ebf..b233d1da0 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java @@ -46,17 +46,17 @@ public class MojangDownloadProvider implements DownloadProvider { @Override public String getVersionBaseURL() { - return "http://s3.amazonaws.com/Minecraft.Download/versions/"; + return "https://s3.amazonaws.com/Minecraft.Download/versions/"; } @Override public String getAssetIndexBaseURL() { - return "http://s3.amazonaws.com/Minecraft.Download/indexes/"; + return "https://s3.amazonaws.com/Minecraft.Download/indexes/"; } @Override public String getAssetBaseURL() { - return "http://resources.download.minecraft.net/"; + return "https://resources.download.minecraft.net/"; } @Override @@ -80,12 +80,12 @@ public class MojangDownloadProvider implements DownloadProvider { if (baseURL == null) return null; //else if (baseURL.contains("scala-swing") || baseURL.contains("scala-xml") || baseURL.contains("scala-parser-combinators")) - // return baseURL.replace("http://files.minecraftforge.net/maven", "http://ftb.cursecdn.com/FTB2/maven"); + // return baseURL.replaceFirst("https?://files\\.minecraftforge\\.net/maven", "https://bmclapi2.bangbang93.com/maven"); /*else if (baseURL.contains("typesafe") || baseURL.contains("scala")) if (isChina) - return baseURL.replace("http://files.minecraftforge.net/maven", "http://maven.aliyun.com/nexus/content/groups/public"); + return baseURL.replaceFirst("https?://files\\.minecraftforge\\.net/maven", "http://maven.aliyun.com/nexus/content/groups/public"); else - return baseURL.replace("http://files.minecraftforge.net/maven", "http://repo1.maven.org/maven2"); + return baseURL.replaceFirst("https?://files\\.minecraftforge\\.net/maven", "https://repo1.maven.org/maven2"); */else return baseURL; } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeVersionList.java index c87a57a0a..4c0e46e07 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeVersionList.java @@ -18,7 +18,6 @@ package org.jackhuang.hmcl.download.forge; import org.jackhuang.hmcl.download.DownloadProvider; -import org.jackhuang.hmcl.download.RemoteVersion; import org.jackhuang.hmcl.download.VersionList; import org.jackhuang.hmcl.task.GetTask; import org.jackhuang.hmcl.task.Task; @@ -93,5 +92,5 @@ public final class ForgeVersionList extends VersionList { }; } - public static final String FORGE_LIST = "http://files.minecraftforge.net/maven/net/minecraftforge/forge/json"; + public static final String FORGE_LIST = "https://files.minecraftforge.net/maven/net/minecraftforge/forge/json"; } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineBMCLVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineBMCLVersionList.java index 55d03006b..102089940 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineBMCLVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineBMCLVersionList.java @@ -19,7 +19,6 @@ package org.jackhuang.hmcl.download.optifine; import com.google.gson.reflect.TypeToken; import org.jackhuang.hmcl.download.DownloadProvider; -import org.jackhuang.hmcl.download.RemoteVersion; import org.jackhuang.hmcl.download.VersionList; import org.jackhuang.hmcl.task.GetTask; import org.jackhuang.hmcl.task.Task; @@ -43,7 +42,7 @@ public final class OptiFineBMCLVersionList extends VersionList { @Override public Task refreshAsync(DownloadProvider downloadProvider) { - GetTask task = new GetTask(NetworkUtils.toURL("http://bmclapi.bangbang93.com/optifine/versionlist")); + GetTask task = new GetTask(NetworkUtils.toURL("https://bmclapi.bangbang93.com/optifine/versionlist")); return new Task() { @Override public Collection getDependents() { @@ -60,7 +59,7 @@ public final class OptiFineBMCLVersionList extends VersionList { String version = element.getType(); if (version == null) continue; - String mirror = "http://bmclapi2.bangbang93.com/optifine/" + element.getGameVersion() + "/" + element.getType() + "/" + element.getPatch(); + String mirror = "https://bmclapi2.bangbang93.com/optifine/" + element.getGameVersion() + "/" + element.getType() + "/" + element.getPatch(); if (!duplicates.add(mirror)) continue; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineVersionList.java index fc3f829a0..f85869a2e 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineVersionList.java @@ -52,7 +52,7 @@ public final class OptiFineVersionList extends VersionList { @Override public Task refreshAsync(DownloadProvider downloadProvider) { - GetTask task = new GetTask(NetworkUtils.toURL("http://optifine.net/downloads")); + GetTask task = new GetTask(NetworkUtils.toURL("https://optifine.net/downloads")); return new Task() { @Override public Collection getDependents() { @@ -116,6 +116,6 @@ public final class OptiFineVersionList extends VersionList { result = m.group(1); if (result == null) throw new IllegalStateException("Cannot find version in " + content); - return "http://optifine.net/downloadx?f=OptiFine" + result; + return "https://optifine.net/downloadx?f=OptiFine" + result; } } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java index 00c5708f2..bd3f3fd05 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java @@ -28,7 +28,6 @@ import org.jackhuang.hmcl.task.Schedulers; import java.awt.*; import java.io.File; import java.nio.charset.Charset; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.UUID; import java.util.function.Consumer; @@ -49,8 +48,8 @@ public final class Constants { public static final Charset SYSTEM_CHARSET = Charset.forName(OperatingSystem.ENCODING); public static final String DEFAULT_LIBRARY_URL = "https://libraries.minecraft.net/"; - public static final String DEFAULT_VERSION_DOWNLOAD_URL = "http://s3.amazonaws.com/Minecraft.Download/versions/"; - public static final String DEFAULT_INDEX_URL = "http://s3.amazonaws.com/Minecraft.Download/indexes/"; + public static final String DEFAULT_VERSION_DOWNLOAD_URL = "https://s3.amazonaws.com/Minecraft.Download/versions/"; + public static final String DEFAULT_INDEX_URL = "https://s3.amazonaws.com/Minecraft.Download/indexes/"; public static Consumer UI_THREAD_SCHEDULER = s -> Schedulers.computation().schedule(s::run);