From 7c0fdaa7303125b26d0a6882d4616016c3923bca Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Wed, 23 Jun 2021 18:19:48 +0100
Subject: [PATCH] NOISSUE Check mod and config checksums for ATLauncher

---
 .../atlauncher/ATLPackInstallTask.cpp         | 20 ++++++++++++++++++-
 .../atlauncher/ATLPackManifest.cpp            | 11 +++++++++-
 .../modplatform/atlauncher/ATLPackManifest.h  |  7 +++++++
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp b/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp
index 89829c051..dac80e8c9 100644
--- a/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -4,6 +4,7 @@
 #include <MMCZip.h>
 #include <minecraft/OneSixVersionFormat.h>
 #include <Version.h>
+#include <net/ChecksumValidator.h>
 #include "ATLPackInstallTask.h"
 
 #include "BuildConfig.h"
@@ -407,7 +408,12 @@ void PackInstallTask::installConfigs()
     auto entry = ENV.metacache()->resolveEntry("ATLauncherPacks", path);
     entry->setStale(true);
 
-    jobPtr->addNetAction(Net::Download::makeCached(url, entry));
+    auto dl = Net::Download::makeCached(url, entry);
+    if (!m_version.configs.sha1.isEmpty()) {
+        auto rawSha1 = QByteArray::fromHex(m_version.configs.sha1.toLatin1());
+        dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawSha1));
+    }
+    jobPtr->addNetAction(dl);
     archivePath = entry->getFullPath();
 
     connect(jobPtr.get(), &NetJob::succeeded, this, [&]()
@@ -508,6 +514,10 @@ void PackInstallTask::downloadMods()
             modsToExtract.insert(entry->getFullPath(), mod);
 
             auto dl = Net::Download::makeCached(url, entry);
+            if (!mod.md5.isEmpty()) {
+                auto rawMd5 = QByteArray::fromHex(mod.md5.toLatin1());
+                dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, rawMd5));
+            }
             jobPtr->addNetAction(dl);
         }
         else if(mod.type == ModType::Decomp) {
@@ -516,6 +526,10 @@ void PackInstallTask::downloadMods()
             modsToDecomp.insert(entry->getFullPath(), mod);
 
             auto dl = Net::Download::makeCached(url, entry);
+            if (!mod.md5.isEmpty()) {
+                auto rawMd5 = QByteArray::fromHex(mod.md5.toLatin1());
+                dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, rawMd5));
+            }
             jobPtr->addNetAction(dl);
         }
         else {
@@ -526,6 +540,10 @@ void PackInstallTask::downloadMods()
             entry->setStale(true);
 
             auto dl = Net::Download::makeCached(url, entry);
+            if (!mod.md5.isEmpty()) {
+                auto rawMd5 = QByteArray::fromHex(mod.md5.toLatin1());
+                dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Md5, rawMd5));
+            }
             jobPtr->addNetAction(dl);
 
             auto path = FS::PathCombine(m_stagingPath, "minecraft", relpath, mod.file);
diff --git a/api/logic/modplatform/atlauncher/ATLPackManifest.cpp b/api/logic/modplatform/atlauncher/ATLPackManifest.cpp
index f28fd35cd..e25d8346c 100644
--- a/api/logic/modplatform/atlauncher/ATLPackManifest.cpp
+++ b/api/logic/modplatform/atlauncher/ATLPackManifest.cpp
@@ -109,6 +109,11 @@ static void loadVersionLibrary(ATLauncher::VersionLibrary & p, QJsonObject & obj
     p.server = Json::ensureString(obj, "server", "");
 }
 
+static void loadVersionConfigs(ATLauncher::VersionConfigs & p, QJsonObject & obj) {
+    p.filesize = Json::requireInteger(obj, "filesize");
+    p.sha1 = Json::requireString(obj, "sha1");
+}
+
 static void loadVersionMod(ATLauncher::VersionMod & p, QJsonObject & obj) {
     p.name = Json::requireString(obj, "name");
     p.version = Json::requireString(obj, "version");
@@ -195,7 +200,6 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
         }
     }
 
-
     if(obj.contains("mods")) {
         auto mods = Json::requireArray(obj, "mods");
         for (const auto modRaw : mods)
@@ -206,4 +210,9 @@ void ATLauncher::loadVersion(PackVersion & v, QJsonObject & obj)
             v.mods.append(mod);
         }
     }
+
+    if(obj.contains("configs")) {
+        auto configsObj = Json::requireObject(obj, "configs");
+        loadVersionConfigs(v.configs, configsObj);
+    }
 }
diff --git a/api/logic/modplatform/atlauncher/ATLPackManifest.h b/api/logic/modplatform/atlauncher/ATLPackManifest.h
index 376587b05..17821e4ce 100644
--- a/api/logic/modplatform/atlauncher/ATLPackManifest.h
+++ b/api/logic/modplatform/atlauncher/ATLPackManifest.h
@@ -101,6 +101,12 @@ struct VersionMod
     bool effectively_hidden;
 };
 
+struct VersionConfigs
+{
+    int filesize;
+    QString sha1;
+};
+
 struct PackVersion
 {
     QString version;
@@ -112,6 +118,7 @@ struct PackVersion
     VersionLoader loader;
     QVector<VersionLibrary> libraries;
     QVector<VersionMod> mods;
+    VersionConfigs configs;
 };
 
 MULTIMC_LOGIC_EXPORT void loadVersion(PackVersion & v, QJsonObject & obj);