From 49378061bfd8b100e19b13010113db034d222787 Mon Sep 17 00:00:00 2001 From: Glavo Date: Sat, 11 Dec 2021 13:11:57 +0800 Subject: [PATCH] Always issue security warning --- .../jackhuang/hmcl/game/LauncherHelper.java | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java index c51c0afd7..65f248c6e 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java @@ -529,27 +529,22 @@ public final class LauncherHelper { } // CVE-2021-44228 Remote code injection in Log4j - if (!suggested) { - if (gameVersion.compareTo(VersionNumber.asVersion("1.7")) >= 0 && gameVersion.compareTo(VersionNumber.asVersion("1.18")) <= 0) { - String xmlSha1 = Optional.ofNullable(version.getLogging().get(DownloadType.CLIENT)) - .flatMap(loggingInfo -> Optional.of(loggingInfo.getFile())) - .flatMap(idDownloadInfo -> Optional.ofNullable(idDownloadInfo.getSha1())) - .orElse(""); - if (gameVersion.compareTo(VersionNumber.asVersion("1.12")) < 0) { - if (UNSAFE_CLIENT_1_7_XML_SHA1.contains(xmlSha1)) { - Controllers.confirm(i18n("launch.advice.log4j_cve_2021_44228"), i18n("message.warning"), continueAction, null); - suggested = true; - } - } else { - if (UNSAFE_CLIENT_1_12_XML_SHA1.contains(xmlSha1)) { - Controllers.confirm(i18n("launch.advice.log4j_cve_2021_44228"), i18n("message.warning"), continueAction, null); - suggested = true; - } + if (gameVersion.compareTo(VersionNumber.asVersion("1.7")) >= 0 && gameVersion.compareTo(VersionNumber.asVersion("1.18")) <= 0) { + String xmlSha1 = Optional.ofNullable(version.getLogging().get(DownloadType.CLIENT)) + .flatMap(loggingInfo -> Optional.of(loggingInfo.getFile())) + .flatMap(idDownloadInfo -> Optional.ofNullable(idDownloadInfo.getSha1())) + .orElse(""); + if (gameVersion.compareTo(VersionNumber.asVersion("1.12")) < 0) { + if (UNSAFE_CLIENT_1_7_XML_SHA1.contains(xmlSha1)) { + Controllers.confirm(i18n("launch.advice.log4j_cve_2021_44228"), i18n("message.warning"), continueAction, null); + } + } else { + if (UNSAFE_CLIENT_1_12_XML_SHA1.contains(xmlSha1)) { + Controllers.confirm(i18n("launch.advice.log4j_cve_2021_44228"), i18n("message.warning"), continueAction, null); } } } - if (!suggested) { future.complete(javaVersion); }