Bump version to 2.8.0

Check hash pattern and launcher signature

---

By creating this pull request, I understand that code that is AI
generated or otherwise automatically generated may be rejected without
further discussion.
I declare that I fully understand all code I pushed into this PR, and
wrote all this code myself and own the rights to this code.

.github/workflows/cmake-linux.yml

@@ -20,7 +20,7 @@ jobs:
         with:
             vcpkgArguments: 'zlib nlohmann-json openssl cpp-httplib[openssl]'
             vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: '40616a5e954f7be1077ef37db3fbddbd5dcd1ca6'
+            vcpkgGitCommitId: 'b5d1a94fb7f88fd835e360fd23a45a09ceedbf48'
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build-linux

.github/workflows/cmake-windows.yml

@@ -20,7 +20,7 @@ jobs:
         with:
             vcpkgArguments: 'discord-rpc zlib nlohmann-json openssl cpp-httplib[openssl]'
             vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: '40616a5e954f7be1077ef37db3fbddbd5dcd1ca6'
+            vcpkgGitCommitId: 'b5d1a94fb7f88fd835e360fd23a45a09ceedbf48'
             vcpkgTriplet: 'x64-windows-static'
 
       - name: Create Build Environment

include/Http.h

@@ -11,7 +11,7 @@
 #include <string>
 class HTTP {
 public:
-    static bool Download(const std::string& IP, const beammp_fs_string& Path);
+    static bool Download(const std::string& IP, const beammp_fs_string& Path, const std::string& Hash);
     static std::string Post(const std::string& IP, const std::string& Fields);
     static std::string Get(const std::string& IP);
     static bool ProgressBar(size_t c, size_t t);

include/Network/network.hpp

@@ -38,6 +38,7 @@ extern std::string MStatus;
 extern std::string UlStatus;
 extern std::string PublicKey;
 extern std::string PrivateKey;
+extern std::string magic;
 int KillSocket(uint64_t Dead);
 void UUl(const std::string& R);
 void UDPSend(std::string Data);

include/Security/Init.h

@@ -7,7 +7,7 @@
 #pragma once
 #include <string>
 void PreGame(const beammp_fs_string& GamePath);
-std::string CheckVer(const beammp_fs_string& path);
+std::string CheckVer(const std::filesystem::path& path);
 void InitGame(const beammp_fs_string& Dir);
 beammp_fs_string GetGameDir();
 void LegitimacyCheck();

include/Startup.h

@@ -13,6 +13,7 @@
 
 void InitLauncher();
 beammp_fs_string GetEP(const beammp_fs_char* P = nullptr);
+std::filesystem::path GetBP(const beammp_fs_char* P = nullptr);
 std::filesystem::path GetGamePath();
 std::string GetVer();
 std::string GetPatch();

include/Utils.h

@@ -13,23 +13,40 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <regex>
+#include <cstdint>
+#include <cstring>
 #include <string>
+#include <variant>
 #include <vector>
+#include <array>
+#include <cerrno>
+#include <cstring>
+#include <stdexcept>
+#if defined(__linux__)
+#include <sys/socket.h>
+#include "linuxfixes.h"
+#else
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
 
 #ifdef _WIN32
 #define beammp_fs_string std::wstring
 #define beammp_fs_char wchar_t
 #define beammp_wide(str) L##str
+#define beammp_stdout std::wcout
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #else
 #define beammp_fs_string std::string
 #define beammp_fs_char char
 #define beammp_wide(str) str
+#define beammp_stdout std::cout
 #endif
 
-namespace Utils {
+#include "Logger.h"
 
+namespace Utils {
     inline std::vector<std::string> Split(const std::string& String, const std::string& delimiter) {
         std::vector<std::string> Val;
         size_t pos;
@@ -43,7 +60,7 @@ namespace Utils {
         if (!s.empty())
             Val.push_back(s);
         return Val;
-    };
+    }
     inline std::string ExpandEnvVars(const std::string& input) {
         std::string result;
         std::regex envPattern(R"(%([^%]+)%|\$([A-Za-z_][A-Za-z0-9_]*)|\$\{([^}]+)\})");
@@ -109,8 +126,8 @@ namespace Utils {
         return result;
     }
 #endif
-    inline std::map<std::string, std::map<std::string, std::string>> ParseINI(const std::string& contents) {
-        std::map<std::string, std::map<std::string, std::string>> ini;
+    inline std::map<std::string, std::variant<std::map<std::string, std::string>, std::string>> ParseINI(const std::string& contents) {
+        std::map<std::string, std::variant<std::map<std::string, std::string>, std::string>> ini;
 
         std::string currentSection;
         auto sections = Split(contents, "\n");
@@ -120,16 +137,9 @@ namespace Utils {
             if (line.empty() || line[0] == ';' || line[0] == '#')
                 continue;
 
-            for (auto& c : line) {
-                if (c == '#' || c == ';') {
-                    line = line.substr(0, &c - &line[0]);
-                    break;
-                }
-            }
-
             auto invalidLineLog = [&]{
-                warn("Invalid INI line: " + line);
-                warn("Surrounding lines: \n" +
+                debug("Invalid INI line: " + line);
+                debug("Surrounding lines: \n" +
                     (i > 0 ? sections[i - 1] : "") + "\n" +
                     (i < sections.size() - 1 ? sections[i + 1] : ""));
             };
@@ -137,18 +147,19 @@ namespace Utils {
             if (line[0] == '[') {
                 currentSection = line.substr(1, line.find(']') - 1);
             } else {
-
-                if (currentSection.empty()) {
-                    invalidLineLog();
-                    continue;
-                }
-
                 std::string key, value;
                 size_t pos = line.find('=');
                 if (pos != std::string::npos) {
                     key = line.substr(0, pos);
+
+                    key = key.substr(0, key.find_last_not_of(" \t") + 1);
+
                     value = line.substr(pos + 1);
-                    ini[currentSection][key] = value;
+                    if (currentSection.empty()) {
+                        ini[key] = value;
+                    } else {
+                        std::get<std::map<std::string, std::string>>(ini[currentSection])[key] = value;
+                    }
                 } else {
                     invalidLineLog();
                     continue;
@@ -158,7 +169,7 @@ namespace Utils {
                 value.erase(0, value.find_first_not_of(" \t"));
                 value.erase(value.find_last_not_of(" \t") + 1);
 
-                ini[currentSection][key] = value;
+                std::get<std::map<std::string, std::string>>(ini[currentSection])[key] = value;
             }
         }
 
@@ -166,7 +177,7 @@ namespace Utils {
     }
 
 #ifdef _WIN32
-inline std::wstring ToWString(const std::string& s) {
+    inline std::wstring ToWString(const std::string& s) {
         if (s.empty()) return std::wstring();
 
         int size_needed = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), (int)s.size(), nullptr, 0);
@@ -185,7 +196,7 @@ inline std::wstring ToWString(const std::string& s) {
         return s;
     }
 #endif
-    inline std::string GetSha256HashReallyFast(const beammp_fs_string& filename) {
+    inline std::string GetSha256HashReallyFastFile(const beammp_fs_string& filename) {
         try {
             EVP_MD_CTX* mdctx;
             const EVP_MD* md;
@@ -237,7 +248,7 @@ inline std::wstring ToWString(const std::string& s) {
             for (size_t i = 0; i < sha256_len; i++) {
                 char buf[3];
                 sprintf(buf, "%02x", sha256_value[i]);
-                buf[2] = 0;
+                buf[2] = '\0';
                 result += buf;
             }
             return result;
@@ -246,4 +257,83 @@ inline std::wstring ToWString(const std::string& s) {
             return "";
         }
     }
-};
+    inline std::string GetSha256HashReallyFast(const std::string& text, const beammp_fs_string& filename) {
+        try {
+            EVP_MD_CTX* mdctx;
+            const EVP_MD* md;
+            uint8_t sha256_value[EVP_MAX_MD_SIZE];
+            md = EVP_sha256();
+            if (md == nullptr) {
+                throw std::runtime_error("EVP_sha256() failed");
+            }
+
+            mdctx = EVP_MD_CTX_new();
+            if (mdctx == nullptr) {
+                throw std::runtime_error("EVP_MD_CTX_new() failed");
+            }
+            if (!EVP_DigestInit_ex2(mdctx, md, NULL)) {
+                EVP_MD_CTX_free(mdctx);
+                throw std::runtime_error("EVP_DigestInit_ex2() failed");
+            }
+
+            if (!EVP_DigestUpdate(mdctx, text.data(), text.size())) {
+                EVP_MD_CTX_free(mdctx);
+                throw std::runtime_error("EVP_DigestUpdate() failed");
+            }
+
+            unsigned int sha256_len = 0;
+            if (!EVP_DigestFinal_ex(mdctx, sha256_value, &sha256_len)) {
+                EVP_MD_CTX_free(mdctx);
+                throw std::runtime_error("EVP_DigestFinal_ex() failed");
+            }
+            EVP_MD_CTX_free(mdctx);
+
+            std::string result;
+            for (size_t i = 0; i < sha256_len; i++) {
+                char buf[3];
+                sprintf(buf, "%02x", sha256_value[i]);
+                buf[2] = '\0';
+                result += buf;
+            }
+            return result;
+        } catch (const std::exception& e) {
+            error(beammp_wide("Sha256 hashing of '") + filename + beammp_wide("' failed: ") + ToWString(e.what()));
+            return "";
+        }
+    }
+
+    template<typename T>
+    inline std::vector<char> PrependHeader(const T& data) {
+        std::vector<char> size_buffer(4);
+        uint32_t len = data.size();
+        std::memcpy(size_buffer.data(), &len, 4);
+        std::vector<char> buffer;
+        buffer.reserve(size_buffer.size() + data.size());
+        buffer.insert(buffer.begin(), size_buffer.begin(), size_buffer.end());
+        buffer.insert(buffer.end(), data.begin(), data.end());
+        return buffer;
+    }
+
+    inline uint32_t RecvHeader(SOCKET socket) {
+        std::array<uint8_t, sizeof(uint32_t)> header_buffer {};
+        auto n = recv(socket, reinterpret_cast<char*>(header_buffer.data()), header_buffer.size(), MSG_WAITALL);
+        if (n < 0) {
+            throw std::runtime_error(std::string("recv() of header failed: ") + std::strerror(errno));
+        } else if (n == 0) {
+            throw std::runtime_error("Game disconnected");
+        }
+        return *reinterpret_cast<uint32_t*>(header_buffer.data());
+    }
+
+    /// Throws!!!
+    inline void ReceiveFromGame(SOCKET socket, std::vector<char>& out_data) {
+        auto header = RecvHeader(socket);
+        out_data.resize(header);
+        auto n = recv(socket, reinterpret_cast<char*>(out_data.data()), out_data.size(), MSG_WAITALL);
+        if (n < 0) {
+            throw std::runtime_error(std::string("recv() of data failed: ") + std::strerror(errno));
+        } else if (n == 0) {
+            throw std::runtime_error("Game disconnected");
+        }
+    }
+};

src/GameStart.cpp

@@ -4,6 +4,8 @@
  SPDX-License-Identifier: AGPL-3.0-or-later
 */
 
+#include <cstring>
+#include "Utils.h"
 #if defined(_WIN32)
 #include <shlobj.h>
 #elif defined(__linux__)
@@ -18,7 +20,6 @@
 #include "Logger.h"
 #include "Options.h"
 #include "Startup.h"
-#include "Utils.h"
 #include <Security/Init.h>
 #include <filesystem>
 #include <thread>
@@ -54,44 +55,64 @@ std::filesystem::path GetGamePath() {
                 debug("Successfully parsed startup.ini");
 
             std::wstring userPath;
-            if (ini.contains("filesystem") && ini["filesystem"].contains("UserPath"))
-                userPath = Utils::ToWString(ini["filesystem"]["UserPath"]);
+            if (ini.contains("filesystem") && std::get<std::map<std::string, std::string>>(ini["filesystem"]).contains("UserPath"))
+                userPath = Utils::ToWString(std::get<std::map<std::string, std::string>>(ini["filesystem"])["UserPath"]);
 
-            if (!userPath.empty())
-                if (userPath = Utils::ExpandEnvVars(userPath); std::filesystem::exists(userPath)) {
-                    Path = userPath;
-                    debug(L"Using custom user folder path from startup.ini: " + Path.wstring());
-                } else
-                    warn(L"Found custom user folder path (" + userPath + L") in startup.ini but it doesn't exist, skipping");
+            if (userPath = Utils::ExpandEnvVars(userPath); std::filesystem::exists(userPath)) {
+                Path = userPath;
+                debug(L"Using custom user folder path from startup.ini: " + Path.wstring());
+            } else
+                warn(L"Found custom user folder path (" + userPath + L") in startup.ini but it doesn't exist, skipping");
         }
 
         if (Path.empty()) {
-            HKEY hKey;
-            LPCTSTR sk = "Software\\BeamNG\\BeamNG.drive";
-            LONG openRes = RegOpenKeyEx(HKEY_CURRENT_USER, sk, 0, KEY_ALL_ACCESS, &hKey);
-            if (openRes != ERROR_SUCCESS) {
-                fatal("Please launch the game at least once!");
+            wchar_t* appDataPath = new wchar_t[MAX_PATH];
+            HRESULT result = SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, appDataPath);
+
+            if (!SUCCEEDED(result)) {
+                fatal("Cannot get Local Appdata directory");
+            }
+
+            auto BeamNGAppdataPath = std::filesystem::path(appDataPath) / "BeamNG";
+
+            if (const auto beamngIniPath = BeamNGAppdataPath / "BeamNG.Drive.ini"; exists(beamngIniPath)) {
+                if (std::ifstream beamngIni(beamngIniPath); beamngIni.is_open()) {
+                    std::string contents((std::istreambuf_iterator(beamngIni)), std::istreambuf_iterator<char>());
+                    beamngIni.close();
+
+                    auto ini = Utils::ParseINI(contents);
+                    if (ini.empty())
+                        warn("Failed to parse BeamNG.Drive.ini");
+                    else
+                        debug("Successfully parsed BeamNG.Drive.ini");
+
+                    std::wstring userPath;
+
+                    if (ini.contains("userFolder")) {
+                        userPath = Utils::ToWString(std::get<std::string>(ini["userFolder"]));
+                        userPath.erase(0, userPath.find_first_not_of(L" \t"));
+
+                    }
+
+                    if (userPath = std::filesystem::path(Utils::ExpandEnvVars(userPath)); std::filesystem::exists(userPath)) {
+                        Path = userPath;
+                        debug(L"Using custom user folder path from BeamNG.Drive.ini: " + Path.wstring());
+                    } else
+                        warn(L"Found custom user folder path (" + userPath + L") in BeamNG.Drive.ini but it doesn't exist, skipping");
+                }
             }
-            Path = QueryKey(hKey, 4);
 
             if (Path.empty()) {
-                wchar_t* appDataPath = new wchar_t[MAX_PATH];
-                HRESULT result = SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, appDataPath);
-
-                if (!SUCCEEDED(result)) {
-                    fatal("Cannot get Local Appdata directory");
-                }
-
-                Path = std::filesystem::path(appDataPath) / "BeamNG.drive";
-
-                delete[] appDataPath;
+                Path = BeamNGAppdataPath / "BeamNG.drive";
             }
+
+            delete[] appDataPath;
         }
     }
 
     std::string Ver = CheckVer(GetGameDir());
     Ver = Ver.substr(0, Ver.find('.', Ver.find('.') + 1));
-    Path /= Utils::ToWString(Ver);
+    Path /= Utils::ToWString("current");
     return Path;
 }
 #elif defined(__linux__)
@@ -100,10 +121,10 @@ std::filesystem::path GetGamePath() {
     struct passwd* pw = getpwuid(getuid());
     std::string homeDir = pw->pw_dir;
 
-    std::string Path = homeDir + "/.local/share/BeamNG.drive/";
+    std::string Path = homeDir + "/.local/share/BeamNG/BeamNG.drive/";
     std::string Ver = CheckVer(GetGameDir());
     Ver = Ver.substr(0, Ver.find('.', Ver.find('.') + 1));
-    Path += Ver + "/";
+    Path += "current/";
     return Path;
 }
 #endif
@@ -153,7 +174,6 @@ void StartGame(std::wstring Dir) {
 }
 #elif defined(__linux__)
 void StartGame(std::string Dir) {
-    int status;
     std::string filename = (Dir + "/BinLinux/BeamNG.drive.x64");
     std::vector<const char*> argv;
     argv.push_back(filename.data());
@@ -163,11 +183,24 @@ void StartGame(std::string Dir) {
 
     argv.push_back(nullptr);
     pid_t pid;
-    posix_spawn_file_actions_t spawn_actions;
-    posix_spawn_file_actions_init(&spawn_actions);
-    posix_spawn_file_actions_addclose(&spawn_actions, STDOUT_FILENO);
-    posix_spawn_file_actions_addclose(&spawn_actions, STDERR_FILENO);
-    int result = posix_spawn(&pid, filename.c_str(), &spawn_actions, nullptr, const_cast<char**>(argv.data()), environ);
+
+    posix_spawn_file_actions_t file_actions;
+    auto status = posix_spawn_file_actions_init(&file_actions);
+    // disable stdout
+    if (status != 0) {
+        error(std::string("posix_spawn_file_actions_init failed: ") + std::strerror(errno));
+    }
+    status = posix_spawn_file_actions_addclose(&file_actions, STDOUT_FILENO);
+    if (status != 0) {
+        error(std::string("posix_spawn_file_actions_addclose for STDOUT failed: ") + std::strerror(errno));
+    }
+    status = posix_spawn_file_actions_addclose(&file_actions, STDERR_FILENO);
+    if (status != 0) {
+        error(std::string("posix_spawn_file_actions_addclose for STDERR failed: ") + std::strerror(errno));
+    }
+
+    // launch the game
+    int result = posix_spawn(&pid, filename.c_str(), &file_actions, NULL, const_cast<char**>(argv.data()), environ);
 
     if (result != 0) {
         error("Failed to Launch the game! launcher closing soon");

src/Logger.cpp

@@ -57,36 +57,36 @@ void addToLog(const std::wstring& Line) {
 }
 void info(const std::string& toPrint) {
     std::string Print = getDate() + "[INFO] " + toPrint + "\n";
-    std::cout << Print;
+    beammp_stdout << Utils::ToWString(Print);
     addToLog(Print);
 }
 void debug(const std::string& toPrint) {
     std::string Print = getDate() + "[DEBUG] " + toPrint + "\n";
     if (options.verbose) {
-        std::cout << Print;
+        beammp_stdout << Utils::ToWString(Print);
     }
     addToLog(Print);
 }
 void warn(const std::string& toPrint) {
     std::string Print = getDate() + "[WARN] " + toPrint + "\n";
-    std::cout << Print;
+    beammp_stdout << Utils::ToWString(Print);
     addToLog(Print);
 }
 void error(const std::string& toPrint) {
     std::string Print = getDate() + "[ERROR] " + toPrint + "\n";
-    std::cout << Print;
+    beammp_stdout << Utils::ToWString(Print);
     addToLog(Print);
 }
 void fatal(const std::string& toPrint) {
     std::string Print = getDate() + "[FATAL] " + toPrint + "\n";
-    std::cout << Print;
+    beammp_stdout << Utils::ToWString(Print);
     addToLog(Print);
     std::this_thread::sleep_for(std::chrono::seconds(5));
     std::exit(1);
 }
 void except(const std::string& toPrint) {
     std::string Print = getDate() + "[EXCEP] " + toPrint + "\n";
-    std::cout << Print;
+    beammp_stdout << Utils::ToWString(Print);
     addToLog(Print);
 }
 

src/Network/Core.cpp

@@ -7,6 +7,7 @@
 #include "Http.h"
 #include "Network/network.hpp"
 #include "Security/Init.h"
+#include "Utils.h"
 #include <cstdlib>
 #include <regex>
 #if defined(_WIN32)
@@ -188,7 +189,8 @@ void CoreSend(std::string data) {
     std::lock_guard lock(sendMutex);
     
     if (CoreSocket != -1) {
-        int res = send(CoreSocket, (data + "\n").c_str(), int(data.size()) + 1, 0);
+        auto ToSend = Utils::PrependHeader(data);
+        int res = send(CoreSocket, ToSend.data(), ToSend.size(), 0);
         if (res < 0) {
             debug("(Core) send failed with error: " + std::to_string(WSAGetLastError()));
         }
@@ -278,7 +280,7 @@ void Parse(std::string Data, SOCKET CSocket) {
                 Ping = "-2";
             else
                 Ping = std::to_string(ping);
-            Data = std::string(UlStatus) + "\n" + "Up" + Ping;
+            Data = "Up" + Ping;
         }
         break;
     case 'M':
@@ -348,51 +350,29 @@ void Parse(std::string Data, SOCKET CSocket) {
         Data.clear();
         break;
     }
-    if (!Data.empty())
-        CoreSend(Data);
+    if (!Data.empty() && CSocket != -1) {
+        auto ToSend = Utils::PrependHeader(Data);
+        int res = send(CSocket, ToSend.data(), ToSend.size(), 0);
+        if (res < 0) {
+            debug("(Core) send failed with error: " + std::to_string(WSAGetLastError()));
+        }
+    }
 }
 void GameHandler(SOCKET Client) {
     CoreSocket = Client;
-    int32_t Size, Rcv;
+    std::vector<char> data{};
     int Temp;
     char Header[10] = { 0 };
     do {
-        Rcv = 0;
-        do {
-            Temp = recv(Client, &Header[Rcv], 1, 0);
-            if (Temp < 1)
-                break;
-            if (!isdigit(Header[Rcv]) && Header[Rcv] != '>') {
-                error("(Core) Invalid lua communication");
-                KillSocket(Client);
-                return;
-            }
-        } while (Header[Rcv++] != '>');
-        if (Temp < 1)
-            break;
-        if (std::from_chars(Header, &Header[Rcv], Size).ptr[0] != '>') {
-            debug("(Core) Invalid lua Header -> " + std::string(Header, Rcv));
+        try {
+            Utils::ReceiveFromGame(Client, data);
+            Parse(std::string(data.data(), data.size()), Client);
+        } catch (const std::exception& e) {
+            error(std::string("Error while receiving from game on core: ") + e.what());
             break;
         }
-        std::string Ret(Size, 0);
-        Rcv = 0;
-
-        do {
-            Temp = recv(Client, &Ret[Rcv], Size - Rcv, 0);
-            if (Temp < 1)
-                break;
-            Rcv += Temp;
-        } while (Rcv < Size);
-        if (Temp < 1)
-            break;
-
-        Parse(Ret, Client);
-    } while (Temp > 0);
-    if (Temp == 0) {
-        debug("(Core) Connection closing");
-    } else {
-        debug("(Core) recv failed with error: " + std::to_string(WSAGetLastError()));
-    }
+    } while (true);
+    debug("(Core) Connection closing");
     NetReset();
     KillSocket(Client);
 }

src/Network/GlobalHandler.cpp

@@ -5,6 +5,7 @@
 */
 
 #include "Network/network.hpp"
+#include "Utils.h"
 #include <memory>
 #include <zlib.h>
 #if defined(_WIN32)
@@ -21,6 +22,7 @@
 #endif
 
 #include "Logger.h"
+#include "Options.h"
 #include <charconv>
 #include <mutex>
 #include <string>
@@ -33,6 +35,7 @@ bool GConnected = false;
 bool CServer = true;
 SOCKET CSocket = -1;
 SOCKET GSocket = -1;
+std::string magic;
 
 int KillSocket(uint64_t Dead) {
     if (Dead == (SOCKET)-1) {
@@ -61,30 +64,13 @@ bool CheckBytes(uint32_t Bytes) {
 void GameSend(std::string_view Data) {
     static std::mutex Lock;
     std::scoped_lock Guard(Lock);
-    if (TCPTerminate || !GConnected || CSocket == -1)
-        return;
-    int32_t Size, Temp, Sent;
-    Size = int32_t(Data.size());
-    Sent = 0;
-#ifdef DEBUG
-    if (Size > 1000) {
-        debug("Launcher -> game (" + std::to_string(Size) + ")");
-    }
-#endif
-    do {
-        if (Sent > -1) {
-            Temp = send(CSocket, &Data[Sent], Size - Sent, 0);
-        }
-        if (!CheckBytes(Temp))
-            return;
-        Sent += Temp;
-    } while (Sent < Size);
-    // send separately to avoid an allocation for += "\n"
-    Temp = send(CSocket, "\n", 1, 0);
-    if (!CheckBytes(Temp)) {
-        return;
+    auto ToSend = Utils::PrependHeader<std::string_view>(Data);
+    auto Result = send(CSocket, ToSend.data(), ToSend.size(), 0);
+    if (Result < 0) {
+        error("(Game) send failed with error: " + std::to_string(WSAGetLastError()));
     }
 }
+
 void ServerSend(std::string Data, bool Rel) {
     if (Terminate || Data.empty())
         return;
@@ -218,6 +204,8 @@ void ParserAsync(std::string_view Data) {
         MStatus = Data;
         UlStatus = "Uldone";
         return;
+    case 'U':
+        magic = Data.substr(1);
     default:
         break;
     }
@@ -265,40 +253,19 @@ void TCPGameServer(const std::string& IP, int Port) {
         int32_t Size, Rcv;
         int Temp;
         char Header[10] = { 0 };
+        std::vector<char> data {};
 
         // Read byte by byte until '>' is rcved then get the size and read based on it
         do {
-            Rcv = 0;
-
-            do {
-                Temp = recv(CSocket, &Header[Rcv], 1, 0);
-                if (Temp < 1 || TCPTerminate)
-                    break;
-            } while (Header[Rcv++] != '>');
-            if (Temp < 1 || TCPTerminate)
-                break;
-            if (std::from_chars(Header, &Header[Rcv], Size).ptr[0] != '>') {
-                debug("(Game) Invalid lua Header -> " + std::string(Header, Rcv));
+            try {
+                Utils::ReceiveFromGame(CSocket, data);
+                ServerSend(std::string(data.data(), data.size()), false);
+            } catch (const std::exception& e) {
+                error(std::string("Error while receiving from game on proxy: ") + e.what());
                 break;
             }
-            std::string Ret(Size, 0);
-            Rcv = 0;
-            do {
-                Temp = recv(CSocket, &Ret[Rcv], Size - Rcv, 0);
-                if (Temp < 1)
-                    break;
-                Rcv += Temp;
-            } while (Rcv < Size && !TCPTerminate);
-            if (Temp < 1 || TCPTerminate)
-                break;
-
-            ServerSend(Ret, false);
-
-        } while (Temp > 0 && !TCPTerminate);
-        if (Temp == 0)
-            debug("(Proxy) Connection closing");
-        else
-            debug("(Proxy) recv failed error : " + std::to_string(WSAGetLastError()));
+        } while (!TCPTerminate);
+        debug("(Proxy) Connection closing");
     }
     TCPTerminate = true;
     GConnected = false;

src/Network/Http.cpp

@@ -20,45 +20,6 @@
 #include <mutex>
 #include <nlohmann/json.hpp>
 
-void WriteHttpDebug(const httplib::Client& client, const std::string& method, const std::string& target, const httplib::Result& result) try {
-    const std::filesystem::path folder = ".https_debug";
-    std::filesystem::create_directories(folder);
-    if (!std::filesystem::exists(folder / "WHAT IS THIS FOLDER.txt")) {
-        std::ofstream ignore { folder / "WHAT IS THIS FOLDER.txt" };
-        ignore << "This folder exists to help debug current issues with the backend. Do not share this folder with anyone but BeamMP staff. It contains detailed logs of any failed http requests." << std::endl;
-    }
-    const auto file = folder / (method + ".json");
-    // 1 MB limit
-    if (std::filesystem::exists(file) && std::filesystem::file_size(file) > 1'000'000) {
-        std::filesystem::rename(file, file.generic_string() + ".bak");
-    }
-
-    std::ofstream of { file, std::ios::app };
-    nlohmann::json js {
-        { "utc", std::chrono::system_clock::now().time_since_epoch().count() },
-        { "target", target },
-        { "client_info", {
-                             { "openssl_verify_result", client.get_openssl_verify_result() },
-                             { "host", client.host() },
-                             { "port", client.port() },
-                             { "socket_open", client.is_socket_open() },
-                             { "valid", client.is_valid() },
-                         } },
-    };
-    if (result) {
-        auto value = result.value();
-        js["result"] = {};
-        js["result"]["body"] = value.body;
-        js["result"]["status"] = value.status;
-        js["result"]["headers"] = value.headers;
-        js["result"]["version"] = value.version;
-        js["result"]["location"] = value.location;
-        js["result"]["reason"] = value.reason;
-    }
-    of << js.dump();
-} catch (const std::exception& e) {
-    error(e.what());
-}
 
 static size_t CurlWriteCallback(void* contents, size_t size, size_t nmemb, void* userp) {
     std::string* Result = reinterpret_cast<std::string*>(userp);
@@ -127,7 +88,7 @@ std::string HTTP::Post(const std::string& IP, const std::string& Fields) {
     return Ret;
 }
 
-bool HTTP::Download(const std::string& IP, const beammp_fs_string& Path) {
+bool HTTP::Download(const std::string& IP, const beammp_fs_string& Path, const std::string& Hash) {
     static std::mutex Lock;
     std::scoped_lock Guard(Lock);
 
@@ -139,6 +100,16 @@ bool HTTP::Download(const std::string& IP, const beammp_fs_string& Path) {
         return false;
     }
 
+    std::string RetHash = Utils::GetSha256HashReallyFast(Ret, Path);
+
+    debug("Return hash: " + RetHash);
+    debug("Expected hash: " + Hash);
+
+    if (RetHash != Hash) {
+        error("Downloaded file hash does not match expected hash");
+        return false;
+    }
+
     std::ofstream File(Path, std::ios::binary);
     if (File.is_open()) {
         File << Ret;

src/Network/Resources.cpp

@@ -445,7 +445,7 @@ void NewSyncResources(SOCKET Sock, const std::string& Mods, const std::vector<Mo
         }
         auto FileName = std::filesystem::path(ModInfoIter->FileName).stem().string() + "-" + ModInfoIter->Hash.substr(0, 8) + std::filesystem::path(ModInfoIter->FileName).extension().string();
         auto PathToSaveTo = (CachingDirectory / FileName);
-        if (fs::exists(PathToSaveTo) && Utils::GetSha256HashReallyFast(PathToSaveTo) == ModInfoIter->Hash) {
+        if (fs::exists(PathToSaveTo) && Utils::GetSha256HashReallyFastFile(PathToSaveTo) == ModInfoIter->Hash) {
             debug("Mod '" + FileName + "' found in cache");
             UpdateUl(false, std::to_string(ModNo) + "/" + std::to_string(TotalMods) + ": " + ModInfoIter->FileName);
             std::this_thread::sleep_for(std::chrono::milliseconds(50));
@@ -476,7 +476,7 @@ void NewSyncResources(SOCKET Sock, const std::string& Mods, const std::vector<Mo
             WaitForConfirm();
             continue;
         } else if (auto OldCachedPath = CachingDirectory / std::filesystem::path(ModInfoIter->FileName).filename();
-                   fs::exists(OldCachedPath) && Utils::GetSha256HashReallyFast(OldCachedPath) == ModInfoIter->Hash) {
+                   fs::exists(OldCachedPath) && Utils::GetSha256HashReallyFastFile(OldCachedPath) == ModInfoIter->Hash) {
             debug("Mod '" + FileName + "' found in old cache, copying it to the new cache");
             UpdateUl(false, std::to_string(ModNo) + "/" + std::to_string(TotalMods) + ": " + ModInfoIter->FileName);
             std::this_thread::sleep_for(std::chrono::milliseconds(50));
@@ -562,7 +562,7 @@ void NewSyncResources(SOCKET Sock, const std::string& Mods, const std::vector<Mo
                 Terminate = true;
             }
 
-            if (Utils::GetSha256HashReallyFast(PathToSaveTo) != ModInfoIter->Hash) {
+            if (Utils::GetSha256HashReallyFastFile(PathToSaveTo) != ModInfoIter->Hash) {
                 error(beammp_wide("Failed to write or download the entire file '") + beammp_fs_string(PathToSaveTo) + beammp_wide("' correctly (hash mismatch)"));
                 Terminate = true;
             }

src/Network/VehicleData.cpp

@@ -93,6 +93,9 @@ void UDPClientMain(const std::string& IP, int Port) {
     ToServer->sin_port = htons(Port);
     inet_pton(AF_INET, IP.c_str(), &ToServer->sin_addr);
     UDPSock = socket(AF_INET, SOCK_DGRAM, 0);
+    if (!magic.empty())
+        for (int i = 0; i < 10; i++)
+            UDPSend(magic);
     GameSend("P" + std::to_string(ClientID));
     TCPSend("H", TCPSock);
     UDPSend("p");

src/Security/BeamNG.cpp

@@ -6,7 +6,9 @@
 
 
 #include <filesystem>
+#include "Utils.h"
 #if defined(_WIN32)
+#include <shlobj_core.h>
 #elif defined(__linux__)
 #include "vdf_parser.hpp"
 #include <pwd.h>
@@ -14,8 +16,6 @@
 #include <vector>
 #endif
 #include "Logger.h"
-#include "Utils.h"
-
 #include <fstream>
 #include <string>
 #include <thread>
@@ -162,24 +162,70 @@ void FileList(std::vector<std::string>& a, const std::string& Path) {
 }
 void LegitimacyCheck() {
 #if defined(_WIN32)
-    std::wstring Result;
-    std::string K3 = R"(Software\BeamNG\BeamNG.drive)";
-    HKEY hKey;
-    LONG dwRegOPenKey = OpenKey(HKEY_CURRENT_USER, K3.c_str(), &hKey);
-    if (dwRegOPenKey == ERROR_SUCCESS) {
-        Result = QueryKey(hKey, 3);
-        if (Result.empty()) {
-            debug("Failed to QUERY key HKEY_CURRENT_USER\\Software\\BeamNG\\BeamNG.drive");
-            lowExit(3);
-        }
-        GameDir = Result;
-    } else {
-        debug("Failed to OPEN key HKEY_CURRENT_USER\\Software\\BeamNG\\BeamNG.drive");
-        lowExit(4);
+    wchar_t* appDataPath = new wchar_t[MAX_PATH];
+    HRESULT result = SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, appDataPath);
+
+    if (!SUCCEEDED(result)) {
+        fatal("Cannot get Local Appdata directory");
     }
-    K3.clear();
-    Result.clear();
-    RegCloseKey(hKey);
+
+    auto BeamNGAppdataPath = std::filesystem::path(appDataPath) / "BeamNG";
+
+    if (const auto beamngIniPath = BeamNGAppdataPath / "BeamNG.Drive.ini"; exists(beamngIniPath)) {
+        if (std::ifstream beamngIni(beamngIniPath); beamngIni.is_open()) {
+            std::string contents((std::istreambuf_iterator(beamngIni)), std::istreambuf_iterator<char>());
+            beamngIni.close();
+
+            if (contents.size() >= 3 && (unsigned char)contents[0] == 0xEF && (unsigned char)contents[1] == 0xBB && (unsigned char)contents[2] == 0xBF) {
+                contents = contents.substr(3);
+            }
+
+            auto ini = Utils::ParseINI(contents);
+            if (ini.empty())
+                lowExit(3);
+            else
+                debug("Successfully parsed BeamNG.Drive.ini");
+
+            if (ini.contains("installPath")) {
+                std::wstring installPath = Utils::ToWString(std::get<std::string>(ini["installPath"]));
+                installPath.erase(0, installPath.find_first_not_of(L" \t"));
+
+                if (installPath = std::filesystem::path(Utils::ExpandEnvVars(installPath)); std::filesystem::exists(installPath)) {
+                    GameDir = installPath;
+                    debug(L"GameDir from BeamNG.Drive.ini: " + installPath);
+                } else {
+                    lowExit(4);
+                }
+            } else {
+                lowExit(5);
+            }
+        }
+    } else {
+        std::wstring Result;
+
+        std::string K3 = R"(Software\BeamNG\BeamNG.drive)";
+
+        HKEY hKey;
+
+        LONG dwRegOPenKey = OpenKey(HKEY_CURRENT_USER, K3.c_str(), &hKey);
+        if (dwRegOPenKey == ERROR_SUCCESS) {
+            Result = QueryKey(hKey, 3);
+            if (Result.empty()) {
+                debug("Failed to QUERY key HKEY_CURRENT_USER\\Software\\BeamNG\\BeamNG.drive");
+                lowExit(6);
+            }
+            GameDir = Result;
+            debug(L"GameDir from registry: " + Result);
+        } else {
+            debug("Failed to OPEN key HKEY_CURRENT_USER\\Software\\BeamNG\\BeamNG.drive");
+            lowExit(7);
+        }
+        K3.clear();
+        Result.clear();
+        RegCloseKey(hKey);
+    }
+
+    delete[] appDataPath;
 #elif defined(__linux__)
     struct passwd* pw = getpwuid(getuid());
     std::filesystem::path homeDir = pw->pw_dir;
@@ -187,6 +233,7 @@ void LegitimacyCheck() {
     // Right now only steam is supported
     std::vector<std::filesystem::path> steamappsCommonPaths = {
         ".steam/root/steamapps", // default
+        ".steam/steam/steamapps", // Legacy Steam installations
         ".var/app/com.valvesoftware.Steam/.steam/root/steamapps", // flatpak
         "snap/steam/common/.local/share/Steam/steamapps" // snap
     };
@@ -221,7 +268,7 @@ void LegitimacyCheck() {
     std::ifstream libraryFolders(libraryFoldersPath);
     auto root = tyti::vdf::read(libraryFolders);
     for (auto folderInfo : root.childs) {
-        if (std::filesystem::exists(folderInfo.second->attribs["path"] + "/steamapps/common/BeamNG.drive/integrity.json")){
+        if ((folderInfo.second->childs["apps"]->attribs).contains("284160") && std::filesystem::exists(folderInfo.second->attribs["path"] + "/steamapps/common/BeamNG.drive/integrity.json")){
             GameDir = folderInfo.second->attribs["path"] + "/steamapps/common/BeamNG.drive/";
             break;
         }
@@ -232,9 +279,9 @@ void LegitimacyCheck() {
     }
 #endif
 }
-std::string CheckVer(const beammp_fs_string& dir) {
+std::string CheckVer(const std::filesystem::path& dir) {
     std::string temp;
-    beammp_fs_string Path = dir + beammp_wide("\\integrity.json");
+    std::filesystem::path Path = dir / beammp_wide("integrity.json");
     std::ifstream f(Path.c_str(), std::ios::binary);
     int Size = int(std::filesystem::file_size(Path));
     std::string vec(Size, 0);

src/Startup.cpp

@@ -4,7 +4,6 @@
  SPDX-License-Identifier: AGPL-3.0-or-later
 */
 
-
 #include "zip_file.h"
 #include <charconv>
 #include <cstring>
@@ -14,7 +13,10 @@
 #if defined(_WIN32)
 #elif defined(__linux__)
 #include <unistd.h>
-#endif
+#elif defined(__APPLE__)
+#include <libproc.h>
+#include <unistd.h>
+#endif // __APPLE__
 #include "Http.h"
 #include "Logger.h"
 #include "Network/network.hpp"
@@ -73,11 +75,15 @@ Version::Version(const std::array<uint8_t, 3>& v)
 }
 
 beammp_fs_string GetEN() {
-    return beammp_wide("BeamMP-Launcher.exe");
+#if defined(_WIN32)
+    return L"BeamMP-Launcher.exe";
+#elif defined(__linux__)
+    return "BeamMP-Launcher";
+#endif
 }
 
 std::string GetVer() {
-    return "2.5";
+    return "2.8";
 }
 std::string GetPatch() {
     return ".0";
@@ -90,6 +96,34 @@ beammp_fs_string GetEP(const beammp_fs_char* P) {
     }();
     return Ret;
 }
+
+fs::path GetBP(const beammp_fs_char* P) {
+    fs::path fspath = {};
+#if defined(_WIN32)
+    beammp_fs_char path[256];
+    GetModuleFileNameW(nullptr, path, sizeof(path));
+    fspath = path;
+#elif defined(__linux__)
+    fspath = fs::canonical("/proc/self/exe");
+#elif defined(__APPLE__)
+    pid_t pid = getpid();
+    char path[PROC_PIDPATHINFO_MAXSIZE];
+    // While this is fine for a raw executable,
+    // an application bundle is read-only and these files
+    // should instead be placed in Application Support.
+    proc_pidpath(pid, path, sizeof(path));
+    fspath = std::string(path);
+#else
+    fspath = beammp_fs_string(P);
+#endif
+    fspath = fs::weakly_canonical(fspath.string() + "/..");
+#if defined(_WIN32)
+    return fspath.wstring();
+#else
+    return fspath.string();
+#endif
+}
+
 #if defined(_WIN32)
 void ReLaunch() {
     std::wstring Arg;
@@ -99,7 +133,7 @@ void ReLaunch() {
     }
     info("Relaunch!");
     system("cls");
-    ShellExecuteW(nullptr, L"runas", (GetEP() + GetEN()).c_str(), Arg.c_str(), nullptr, SW_SHOWNORMAL);
+    ShellExecuteW(nullptr, L"runas", (GetBP() / GetEN()).c_str(), Arg.c_str(), nullptr, SW_SHOWNORMAL);
     ShowWindow(GetConsoleWindow(), 0);
     std::this_thread::sleep_for(std::chrono::seconds(1));
     exit(1);
@@ -110,7 +144,7 @@ void URelaunch() {
         Arg += Utils::ToWString(options.argv[c - 1]);
         Arg += L" ";
     }
-    ShellExecuteW(nullptr, L"open", (GetEP() + GetEN()).c_str(), Arg.c_str(), nullptr, SW_SHOWNORMAL);
+    ShellExecuteW(nullptr, L"open", (GetBP() / GetEN()).c_str(), Arg.c_str(), nullptr, SW_SHOWNORMAL);
     ShowWindow(GetConsoleWindow(), 0);
     std::this_thread::sleep_for(std::chrono::seconds(1));
     exit(1);
@@ -124,7 +158,7 @@ void ReLaunch() {
     }
     info("Relaunch!");
     system("clear");
-    int ret = execv(options.executable_name.c_str(), const_cast<char**>(options.argv));
+    int ret = execv((GetBP() / GetEN()).c_str(), const_cast<char**>(options.argv));
     if (ret < 0) {
         error(std::string("execv() failed with: ") + strerror(errno) + ". Failed to relaunch");
         exit(1);
@@ -133,7 +167,7 @@ void ReLaunch() {
     exit(1);
 }
 void URelaunch() {
-    int ret = execv(options.executable_name.c_str(), const_cast<char**>(options.argv));
+    int ret = execv((GetBP() / GetEN()).c_str(), const_cast<char**>(options.argv));
     if (ret < 0) {
         error(std::string("execv() failed with: ") + strerror(errno) + ". Failed to relaunch");
         exit(1);
@@ -159,15 +193,161 @@ void CheckName() {
     }
 }
 
+#if defined(_WIN32)
+#include <wincrypt.h>
+#include <wintrust.h>
+#include <softpub.h>
+#include <iostream>
+
+#pragma comment(lib, "wintrust.lib")
+#pragma comment(lib, "crypt32.lib")
+
+bool CheckThumbprint(std::filesystem::path filepath)
+{
+    HCERTSTORE hStore = NULL;
+    HCRYPTMSG hMsg = NULL;
+
+    if (!CryptQueryObject(
+        CERT_QUERY_OBJECT_FILE,
+        filepath.wstring().c_str(),
+        CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED_EMBED,
+        CERT_QUERY_FORMAT_FLAG_BINARY,
+        0,
+        NULL, NULL, NULL,
+        &hStore,
+        &hMsg,
+        NULL))
+    {
+        return false;
+    }
+
+    DWORD dwSignerInfo = 0;
+    if (!CryptMsgGetParam(hMsg, CMSG_SIGNER_INFO_PARAM, 0, NULL, &dwSignerInfo) || dwSignerInfo == 0)
+        return false;
+
+    PCMSG_SIGNER_INFO pSignerInfo = (PCMSG_SIGNER_INFO)LocalAlloc(LPTR, dwSignerInfo);
+    if (!CryptMsgGetParam(hMsg, CMSG_SIGNER_INFO_PARAM, 0, pSignerInfo, &dwSignerInfo))
+    {
+        LocalFree(pSignerInfo);
+        return false;
+    }
+
+    CERT_INFO certInfo = {};
+    certInfo.Issuer = pSignerInfo->Issuer;
+    certInfo.SerialNumber = pSignerInfo->SerialNumber;
+
+    PCCERT_CONTEXT pCertContext = CertFindCertificateInStore(
+        hStore,
+        X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
+        0,
+        CERT_FIND_SUBJECT_CERT,
+        &certInfo,
+        NULL);
+
+    if (!pCertContext)
+    {
+        LocalFree(pSignerInfo);
+        return false;
+    }
+
+    BYTE hash[64];
+    DWORD hashSize = sizeof(hash);
+
+    bool match = false;
+    if (CertGetCertificateContextProperty(pCertContext, CERT_SHA256_HASH_PROP_ID, hash, &hashSize))
+    {
+        std::string pubKeyData(
+            reinterpret_cast<const char*>(pCertContext->pCertInfo->SubjectPublicKeyInfo.PublicKey.pbData),
+            pCertContext->pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData
+        );
+
+        std::string pubKeyHash = Utils::GetSha256HashReallyFast(pubKeyData, L"PubKey");
+        debug("pub key hash: " + pubKeyHash);
+
+        std::string fileThumbprint;
+        for (DWORD i = 0; i < hashSize; i++)
+        {
+            char buf[3];
+            sprintf_s(buf, "%02x", hash[i]);
+            fileThumbprint += buf;
+        }
+
+        debug("File thumbprint: " +fileThumbprint);
+        debug(filepath);
+
+        if (fileThumbprint == "937f055b713de69416926ed4651d65219a0a0e77d7a78c1932c007e14326da33" && pubKeyHash == "2afad4a5773b0ac449f48350ce0d09c372be0d5bcbaa6d01332ce000baffde99"){
+            match = true;
+        }
+    }
+
+    CertFreeCertificateContext(pCertContext);
+    CertCloseStore(hStore, 0);
+    LocalFree(pSignerInfo);
+
+    return match;
+}
+#include <windows.h>
+#include <wintrust.h>
+#include <Softpub.h>
+#include <filesystem>
+#include <string>
+
+#pragma comment(lib, "wintrust")
+
+bool VerifySignature(const std::filesystem::path& filePath)
+{
+    std::wstring path = filePath.wstring();
+
+    WINTRUST_FILE_INFO fileInfo = {};
+    fileInfo.cbStruct = sizeof(WINTRUST_FILE_INFO);
+    fileInfo.pcwszFilePath = path.c_str();
+    fileInfo.hFile = NULL;
+    fileInfo.pgKnownSubject = NULL;
+
+    WINTRUST_DATA winTrustData = {};
+    winTrustData.cbStruct = sizeof(WINTRUST_DATA);
+    winTrustData.dwUIChoice = WTD_UI_NONE;
+    winTrustData.dwUnionChoice = WTD_CHOICE_FILE;
+    winTrustData.pFile = &fileInfo;
+
+    winTrustData.dwStateAction = WTD_STATEACTION_VERIFY;
+
+    GUID policyGUID = WINTRUST_ACTION_GENERIC_VERIFY_V2;
+
+    LONG status = WinVerifyTrust(
+        NULL,
+        &policyGUID,
+        &winTrustData
+    );
+
+    debug(filePath);
+    debug("Signature check code: " + std::to_string(status));
+
+    winTrustData.dwStateAction = WTD_STATEACTION_CLOSE;
+    WinVerifyTrust(NULL, &policyGUID, &winTrustData);
+
+    return (status == CERT_E_UNTRUSTEDROOT);
+}
+#endif
+
 void CheckForUpdates(const std::string& CV) {
     std::string LatestHash = HTTP::Get("https://backend.beammp.com/sha/launcher?branch=" + Branch + "&pk=" + PublicKey);
     std::string LatestVersion = HTTP::Get(
         "https://backend.beammp.com/version/launcher?branch=" + Branch + "&pk=" + PublicKey);
 
-    transform(LatestHash.begin(), LatestHash.end(), LatestHash.begin(), ::tolower);
-    beammp_fs_string EP(GetEP() + GetEN()), Back(GetEP() + beammp_wide("BeamMP-Launcher.back"));
+    std::regex sha256_pattern(R"(^[a-fA-F0-9]{64}$)");
+    std::smatch match;
 
-    std::string FileHash = Utils::GetSha256HashReallyFast(EP);
+    if (LatestHash.length() != 64 || !std::regex_match(LatestHash, match, sha256_pattern)) {
+        error("Invalid hash from backend, skipping update check.");
+        debug("Launcher hash in question: " + LatestHash);
+        return;
+    }
+
+    transform(LatestHash.begin(), LatestHash.end(), LatestHash.begin(), ::tolower);
+    beammp_fs_string BP(GetBP() / GetEN()), Back(GetBP() / beammp_wide("BeamMP-Launcher.back"));
+
+    std::string FileHash = Utils::GetSha256HashReallyFastFile(BP);
 
     if (FileHash != LatestHash && IsOutdated(Version(VersionStrToInts(GetVer() + GetPatch())), Version(VersionStrToInts(LatestVersion)))) {
         if (!options.no_update) {
@@ -175,15 +355,44 @@ void CheckForUpdates(const std::string& CV) {
 #if defined(__linux__)
             error("Auto update is NOT implemented for the Linux version. Please update manually ASAP as updates contain security patches.");
 #else
-            fs::remove(Back);
-            fs::rename(EP, Back);
             info("Downloading Launcher update " + LatestHash);
-            HTTP::Download(
-                "https://backend.beammp.com/builds/launcher?download=true"
-                "&pk="
-                    + PublicKey + "&branch=" + Branch,
-                EP);
-            URelaunch();
+            std::wstring DownloadLocation = GetBP() / (beammp_wide("new_") + GetEN());
+            if (HTTP::Download(
+                    "https://backend.beammp.com/builds/launcher?download=true"
+                    "&pk="
+                        + PublicKey + "&branch=" + Branch,
+                    DownloadLocation, LatestHash)) {
+                if (!VerifySignature(DownloadLocation) || !CheckThumbprint(DownloadLocation)) {
+                    std::error_code ec;
+                    fs::remove(DownloadLocation, ec);
+                    if (ec) {
+                        error("Failed to remove broken launcher update");
+                    }
+                    throw std::runtime_error("The authenticity of the updated launcher could not be verified, it was corrupted or tampered with.");
+                }
+
+                info("Update signature is valid");
+
+                std::error_code ec;
+                fs::remove(Back, ec);
+                if (ec == std::errc::permission_denied) {
+                    error("Failed to remove old backup file: " + ec.message() + ". Using alternative name.");
+                    fs::rename(BP, Back + beammp_wide(".") + Utils::ToWString(FileHash.substr(0, 8)));
+                } else {
+                    fs::rename(BP, Back);
+                }
+                fs::rename(GetBP() / (beammp_wide("new_") + GetEN()), BP);
+                URelaunch();
+            } else {
+                if (fs::exists(DownloadLocation)) {
+                    std::error_code error_code;
+                    fs::remove(DownloadLocation, error_code);
+                    if (error_code) {
+                        error("Failed to remove broken launcher update");
+                    }
+                }
+                throw std::runtime_error("Failed to download the launcher update! Please try manually updating it, https://docs.beammp.com/FAQ/Update-launcher/");
+            }
 #endif
         } else {
             warn("Launcher update was found, but not updating because --no-update or --dev was specified.");
@@ -193,7 +402,6 @@ void CheckForUpdates(const std::string& CV) {
     TraceBack++;
 }
 
-
 #ifdef _WIN32
 void LinuxPatch() {
     HKEY hKey = nullptr;
@@ -227,6 +435,8 @@ void LinuxPatch() {
 
 void InitLauncher() {
     SetConsoleTitleA(("BeamMP Launcher v" + std::string(GetVer()) + GetPatch()).c_str());
+    SetConsoleOutputCP(CP_UTF8);
+    _setmode(_fileno(stdout), _O_U8TEXT);
     debug("Launcher Version : " + GetVer() + GetPatch());
     CheckName();
     LinuxPatch();
@@ -243,8 +453,8 @@ void InitLauncher() {
 }
 #endif
 
-size_t DirCount(const std::filesystem::path& path) {
-    return (size_t)std::distance(std::filesystem::directory_iterator { path }, std::filesystem::directory_iterator {});
+size_t DirCount(const fs::path& path) {
+    return (size_t)std::distance(fs::directory_iterator { path }, fs::directory_iterator {});
 }
 
 void CheckMP(const beammp_fs_string& Path) {
@@ -310,6 +520,15 @@ void PreGame(const beammp_fs_string& GamePath) {
                              [](auto const& c) -> bool { return !std::isalnum(c); }),
             LatestHash.end());
 
+        std::regex sha256_pattern(R"(^[a-fA-F0-9]{64}$)");
+        std::smatch match;
+
+        if (LatestHash.length() != 64 || !std::regex_match(LatestHash, match, sha256_pattern)) {
+            error("Invalid hash from backend, skipping mod update check.");
+            debug("Mod hash in question: " + LatestHash);
+            return;
+        }
+
         try {
             if (!fs::exists(GetGamePath() / beammp_wide("mods/multiplayer"))) {
                 fs::create_directories(GetGamePath() / beammp_wide("mods/multiplayer"));
@@ -325,14 +544,14 @@ void PreGame(const beammp_fs_string& GamePath) {
         std::string ZipPath(GetGamePath() / R"(mods/multiplayer/beammp.zip)");
 #endif
 
-        std::string FileHash = fs::exists(ZipPath) ? Utils::GetSha256HashReallyFast(ZipPath) : "";
+        std::string FileHash = fs::exists(ZipPath) ? Utils::GetSha256HashReallyFastFile(ZipPath) : "";
 
         if (FileHash != LatestHash) {
             info("Downloading BeamMP Update " + LatestHash);
             HTTP::Download("https://backend.beammp.com/builds/client?download=true"
                            "&pk="
                     + PublicKey + "&branch=" + Branch,
-                ZipPath);
+                ZipPath, LatestHash);
         }
 
         beammp_fs_string Target(GetGamePath() / beammp_wide("mods/unpacked/beammp"));