Parse BeamNG ini on linux too

CMakeLists.txt

@@ -37,4 +37,4 @@ else(WIN32) #MINGW
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -s --static")
     target_link_libraries(${PROJECT_NAME} ssl crypto ws2_32 ssp crypt32 z CURL::libcurl)
 endif(WIN32)
-target_include_directories(${PROJECT_NAME} PRIVATE "include" "include/Network")
+target_include_directories(${PROJECT_NAME} PRIVATE "include")

include/Http.h

@@ -11,9 +11,9 @@
 #include <string>
 class HTTP {
 public:
-    static bool Download(const std::string& IP, const beammp_fs_string& Path, const std::string& Hash, const bool& redirect = true);
-    static std::string Post(std::string IP, const std::string& Fields, const bool& redirect = true);
-    static std::string Get(std::string IP, const bool& redirect = true);
+    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);
     static void StartProxy();
 public:

include/Network/RegionHandler.h

@@ -1,22 +0,0 @@
-/*
- Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
- Licensed under AGPL-3.0 (or later), see <https://www.gnu.org/licenses/>.
- SPDX-License-Identifier: AGPL-3.0-or-later
-*/
-
-#pragma once
-
-#include <vector>
-#include <string>
-#include <array>
-
-class RegionHandler final {
-public:
-    RegionHandler() = delete;
-    static void TopLevelDomainFailed();
-    static std::string RegionToTopLevelDomain();
-    static std::string RedirectURL(const std::string& URL);
-private:
-    static inline unsigned int mRegionIndex { 0 };
-    const static inline std::array<std::string, 2> mValidTLDs {"beammp.com", "beammp.net"};
-};

include/Network/network.hpp

@@ -42,7 +42,7 @@ extern std::string magic;
 int KillSocket(uint64_t Dead);
 void UUl(const std::string& R);
 void UDPSend(std::string Data);
-bool CheckBytes(int32_t Bytes, int32_t Expected = -1);
+bool CheckBytes(int32_t Bytes);
 void GameSend(std::string_view Data);
 void SendLarge(std::string Data);
 std::string TCPRcv(uint64_t Sock);
@@ -56,4 +56,3 @@ void UDPClientMain(const std::string& IP, int Port);
 void TCPGameServer(const std::string& IP, int Port);
 bool SecurityWarning();
 void CoreSend(std::string data);
-int RecvWaitAll(int sockfd, char *buf, int len);

include/Options.h

@@ -20,7 +20,6 @@ struct Options {
     bool no_update = false;
     bool no_launch = false;
     const char* user_path = nullptr;
-    std::string region;
     const char **game_arguments = nullptr;
     int game_arguments_length = 0;
     const char** argv = nullptr;

src/Config.cpp

@@ -49,9 +49,6 @@ void ParseConfig(const nlohmann::json& d) {
         deleteDuplicateMods = d["DeleteDuplicateMods"].get<bool>();
     }
 
-    if (d.contains("Region") && d["Region"].is_string()) {
-        options.region = d["Region"].get<std::string>();
-    }
 }
 
 void ConfigInit() {

src/Network/Core.cpp

@@ -5,7 +5,6 @@
 */
 
 #include "Http.h"
-#include "RegionHandler.h"
 #include "Network/network.hpp"
 #include "Security/Init.h"
 #include "Utils.h"
@@ -144,28 +143,29 @@ void GetServerInfo(std::string Data) {
     const std::string buffer = ([&]() -> std::string {
         int32_t Header;
         std::vector<char> data(sizeof(Header));
-        int Temp = RecvWaitAll(ISock, data.data(), sizeof(Header));
+        int Temp = recv(ISock, data.data(), sizeof(Header), MSG_WAITALL);
 
-        auto checkBytes = ([&](const int32_t bytes, const int32_t expected = -1) -> bool {
+        auto checkBytes = ([&](const int32_t bytes) -> bool {
             if (bytes == 0) {
                 return false;
             } else if (bytes < 0) {
                 return false;
             }
-            if (expected != -1 && bytes != expected) {
-                return false;
-            }
             return true;
         });
 
-        if (!checkBytes(Temp, sizeof(Header))) {
+        if (!checkBytes(Temp)) {
             return "";
         }
         memcpy(&Header, data.data(), sizeof(Header));
 
+        if (!checkBytes(Temp)) {
+            return "";
+        }
+
         data.resize(Header, 0);
-        Temp = RecvWaitAll(ISock, data.data(), Header);
-        if (!checkBytes(Temp, Header)) {
+        Temp = recv(ISock, data.data(), Header, MSG_WAITALL);
+        if (!checkBytes(Temp)) {
             return "";
         }
         return std::string(data.data(), Header);
@@ -227,8 +227,7 @@ void Parse(std::string Data, SOCKET CSocket) {
             TCPTerminate = true;
             Data.clear();
             futures.push_back(std::async(std::launch::async, []() {
-                std::string resp = HTTP::Get("https://backend.beammp.com/servers-info", true);
-                CoreSend("B" + resp);
+                CoreSend("B" + HTTP::Get("https://backend.beammp.com/servers-info"));
             }));
         }
         break;

src/Network/GlobalHandler.cpp

@@ -50,6 +50,17 @@ int KillSocket(uint64_t Dead) {
     return a;
 }
 
+bool CheckBytes(uint32_t Bytes) {
+    if (Bytes == 0) {
+        debug("(Proxy) Connection closing");
+        return false;
+    } else if (Bytes < 0) {
+        debug("(Proxy) send failed with error: " + std::to_string(WSAGetLastError()));
+        return false;
+    }
+    return true;
+}
+
 void GameSend(std::string_view Data) {
     static std::mutex Lock;
     std::scoped_lock Guard(Lock);

src/Network/Http.cpp

@@ -6,8 +6,6 @@
 
 
 #include "Http.h"
-#include "RegionHandler.h"
-#include "Options.h"
 #include <Logger.h>
 #include <Network/network.hpp>
 #include <Startup.h>
@@ -31,12 +29,9 @@ static size_t CurlWriteCallback(void* contents, size_t size, size_t nmemb, void*
 }
 
 bool HTTP::isDownload = false;
-std::string HTTP::Get(std::string IP, const bool& redirect) {
+std::string HTTP::Get(const std::string& IP) {
     std::string Ret;
     static thread_local CURL* curl = curl_easy_init();
-    if (redirect) {
-        IP = RegionHandler::RedirectURL(IP);
-    }
     if (curl) {
         CURLcode res;
         char errbuf[CURL_ERROR_SIZE];
@@ -51,18 +46,7 @@ std::string HTTP::Get(std::string IP, const bool& redirect) {
         if (res != CURLE_OK) {
             error("GET to " + IP + " failed: " + std::string(curl_easy_strerror(res)));
             error("Curl error: " + std::string(errbuf));
-            if (!redirect) {
-                return "";
-            }
-            RegionHandler::TopLevelDomainFailed();
-            IP = RegionHandler::RedirectURL(IP);
-            curl_easy_setopt(curl, CURLOPT_URL, IP.c_str());
-            res = curl_easy_perform(curl);
-            if (res != CURLE_OK) {
-                error("GET to " + IP + " failed: " + std::string(curl_easy_strerror(res)));
-                error("Curl error: " + std::string(errbuf));
-                return "";
-            }
+            return "";
         }
     } else {
         error("Curl easy init failed");
@@ -71,12 +55,9 @@ std::string HTTP::Get(std::string IP, const bool& redirect) {
     return Ret;
 }
 
-std::string HTTP::Post(std::string IP, const std::string& Fields, const bool& redirect) {
+std::string HTTP::Post(const std::string& IP, const std::string& Fields) {
     std::string Ret;
     static thread_local CURL* curl = curl_easy_init();
-    if (redirect) {
-        IP = RegionHandler::RedirectURL(IP);
-    }
     if (curl) {
         CURLcode res;
         char errbuf[CURL_ERROR_SIZE];
@@ -98,18 +79,7 @@ std::string HTTP::Post(std::string IP, const std::string& Fields, const bool& re
         if (res != CURLE_OK) {
             error("POST to " + IP + " failed: " + std::string(curl_easy_strerror(res)));
             error("Curl error: " + std::string(errbuf));
-            if (!redirect) {
-                return "";
-            }
-            RegionHandler::TopLevelDomainFailed();
-            IP = RegionHandler::RedirectURL(IP);
-            curl_easy_setopt(curl, CURLOPT_URL, IP.c_str());
-            res = curl_easy_perform(curl);
-            if (res != CURLE_OK) {
-                error("GET to " + IP + " failed: " + std::string(curl_easy_strerror(res)));
-                error("Curl error: " + std::string(errbuf));
-                return "";
-            }
+            return "";
         }
     } else {
         error("Curl easy init failed");
@@ -118,12 +88,12 @@ std::string HTTP::Post(std::string IP, const std::string& Fields, const bool& re
     return Ret;
 }
 
-bool HTTP::Download(const std::string& IP, const beammp_fs_string& Path, const std::string& Hash, const bool& redirect) {
+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);
 
     info("Downloading an update (this may take a while)");
-    std::string Ret = Get(IP, redirect);
+    std::string Ret = Get(IP);
 
     if (Ret.empty()) {
         error("Download failed");

src/Network/RegionHandler.cpp

@@ -1,39 +0,0 @@
-/*
- Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
- Licensed under AGPL-3.0 (or later), see <https://www.gnu.org/licenses/>.
- SPDX-License-Identifier: AGPL-3.0-or-later
-*/
-
-#include "RegionHandler.h"
-#include "Logger.h"
-#include "Options.h"
-
-#include <regex>
-
-void RegionHandler::TopLevelDomainFailed()
-{
-    info("Top level domain of " + mValidTLDs[mRegionIndex % mValidTLDs.size()] + " didn't respond correctly , changing domain to " + mValidTLDs[(mRegionIndex + 1) % mValidTLDs.size()]);
-    mRegionIndex++;
-}
-
-std::string RegionHandler::RegionToTopLevelDomain()
-{
-    static bool isDeveloperRegion = options.region == "Developer";
-    if (isDeveloperRegion) {
-        return "beammp.dev";
-    }
-    return mValidTLDs[mRegionIndex % mValidTLDs.size()]; // Global
-}
-
-std::string RegionHandler::RedirectURL(const std::string &URL)
-{
-    std::regex link_pattern(R"(^(https:\/\/.*)beammp\.com(\/.*)?$)");
-    std::smatch link_match;
-    if (std::regex_search(URL, link_match, link_pattern) && link_match.position() == 0) {
-        //TLD matched beammp.com
-        std::string before = link_match[1].str();                     // "https://..." up to beammp
-        std::string after  = link_match[2].matched ? link_match[2].str() : ""; // "/path" or ""
-        return before + RegionToTopLevelDomain() + after;
-    }
-    return URL; //if it didn't match, just return the unmodified URL
-}

src/Network/Resources.cpp

@@ -164,7 +164,7 @@ std::vector<char> TCPRcvRaw(SOCKET Sock, uint64_t& GRcv, uint64_t Size) {
     do {
         // receive at most some MB at a time
         int Len = std::min(int(Size - Rcv), 1 * 1024 * 1024);
-        int Temp = RecvWaitAll(Sock, &File[Rcv], Len);
+        int Temp = recv(Sock, &File[Rcv], Len, MSG_WAITALL);
         if (Temp == -1 || Temp == 0) {
             debug("Recv returned: " + std::to_string(Temp));
             if (Temp == -1) {

src/Network/VehicleEvent.cpp

@@ -28,9 +28,9 @@ int LastPort;
 std::string LastIP;
 SOCKET TCPSock = -1;
 
-bool CheckBytes(int32_t Bytes, int32_t Expected) {
+bool CheckBytes(int32_t Bytes) {
     if (Bytes == 0) {
-        debug("(TCP) Connection closing...");
+        debug("(TCP) Connection closing... CheckBytes(16)");
         Terminate = true;
         return false;
     } else if (Bytes < 0) {
@@ -39,11 +39,6 @@ bool CheckBytes(int32_t Bytes, int32_t Expected) {
         Terminate = true;
         return false;
     }
-    if (Expected != -1 && Bytes != Expected) {
-        debug(std::format("(TCP) Short recv detected, expected {} bytes, got {} bytes", Expected, Bytes));
-        Terminate = true;
-        return false;
-    }
     return true;
 }
 void UUl(const std::string& R) {
@@ -80,24 +75,6 @@ void TCPSend(const std::string& Data, uint64_t Sock) {
     } while (Sent < Size);
 }
 
-int RecvWaitAll(int sockfd, char *buf, int len) {
-    // handle MSG_WAITALL not actually filling the whole buffer
-    // happens frequently in wine, and can also happen natively when the OS pauses the execution for various reasons
-    int offset = 0;
-    while (offset < len) {
-        int recv_status = recv(sockfd, &buf[offset], len - offset, MSG_WAITALL);
-        if (recv_status == 0) {
-            // do not discard received data when the other side closes the socket cleanly
-            return offset;
-        }
-        if (recv_status == -1) {
-            return -1;
-        }
-        offset += recv_status;
-    }
-    return offset;
-}
-
 std::string TCPRcv(SOCKET Sock) {
     if (Sock == -1) {
         Terminate = true;
@@ -107,8 +84,8 @@ std::string TCPRcv(SOCKET Sock) {
     int32_t Header;
     int Temp;
     std::vector<char> Data(sizeof(Header));
-    Temp = RecvWaitAll(Sock, Data.data(), sizeof(Header));
-    if (!CheckBytes(Temp, sizeof(Header))) {
+    Temp = recv(Sock, Data.data(), sizeof(Header), MSG_WAITALL);
+    if (!CheckBytes(Temp)) {
         UUl("Socket Closed Code 3");
         return "";
     }
@@ -120,8 +97,8 @@ std::string TCPRcv(SOCKET Sock) {
     }
 
     Data.resize(Header, 0);
-    Temp = RecvWaitAll(Sock, Data.data(), Header);
-    if (!CheckBytes(Temp, Header)) {
+    Temp = recv(Sock, Data.data(), Header, MSG_WAITALL);
+    if (!CheckBytes(Temp)) {
         UUl("Socket Closed Code 5");
         return "";
     }

src/Options.cpp

@@ -92,13 +92,6 @@ void InitOptions(int argc, const char *argv[], Options &options) {
             }
             options.user_path = argv[i + 1];
             i++;
-        } else if (argument == "--region") {
-            if (i + 1 >= argc) {
-                error("You must specify a region after the `--region` argument");
-            }
-            options.region = argv[i + 1];
-            info("Set the region to: " + options.region);
-            i++;
         } else if (argument == "--" || argument == "--game") {
             options.game_arguments = &argv[i + 1];
             options.game_arguments_length = argc - i - 1;

src/Security/BeamNG.cpp

@@ -4,7 +4,6 @@
  SPDX-License-Identifier: AGPL-3.0-or-later
 */
 
-
 #include <filesystem>
 #include "Utils.h"
 #if defined(_WIN32)
@@ -257,7 +256,38 @@ void LegitimacyCheck() {
     }
 
     if (!steamappsFolderFound) {
-        error("Unsupported Steam installation.");
+        warn("Unsupported Steam installation.");
+        auto userfolderIniPath = homeDir / "/.local/share/BeamNG/BeamNG.drive.ini";
+        if (std::filesystem::exists(userfolderIniPath)) {
+            if (std::ifstream beamngIni(userfolderIniPath); 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::string installPath = std::get<std::string>(ini["installPath"]);
+                    installPath.erase(0, installPath.find_first_not_of(" \t"));
+
+                    if (installPath = std::filesystem::path(Utils::ExpandEnvVars(installPath)).string(); std::filesystem::exists(installPath)) {
+                        GameDir = installPath;
+                        debug("GameDir from BeamNG.Drive.ini: " + installPath);
+                    } else {
+                        lowExit(4);
+                    }
+                } else {
+                    lowExit(5);
+                }
+            }
+        }
         return;
     }
     if (!libraryFoldersFound) {

src/Security/Login.cpp

@@ -6,8 +6,6 @@
 
 
 #include "Http.h"
-#include "Options.h"
-#include "RegionHandler.h"
 #include "Logger.h"
 #include <filesystem>
 #include <fstream>

src/Startup.cpp

@@ -24,7 +24,6 @@
 #include "Security/Init.h"
 #include "Startup.h"
 #include "Utils.h"
-#include "RegionHandler.h"
 #include "hashpp.h"
 #include <filesystem>
 #include <fstream>
@@ -333,7 +332,8 @@ bool VerifySignature(const std::filesystem::path& filePath)
 
 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);
+    std::string LatestVersion = HTTP::Get(
+        "https://backend.beammp.com/version/launcher?branch=" + Branch + "&pk=" + PublicKey);
 
     std::regex sha256_pattern(R"(^[a-fA-F0-9]{64}$)");
     std::smatch match;
@@ -357,13 +357,11 @@ void CheckForUpdates(const std::string& CV) {
 #else
             info("Downloading Launcher update " + LatestHash);
             std::wstring DownloadLocation = GetBP() / (beammp_wide("new_") + GetEN());
-            bool downloadSuccess = false;
-            downloadSuccess = HTTP::Download(
+            if (HTTP::Download(
                     "https://backend.beammp.com/builds/launcher?download=true"
                     "&pk="
                         + PublicKey + "&branch=" + Branch,
-                DownloadLocation, LatestHash);
-            if (downloadSuccess) {
+                    DownloadLocation, LatestHash)) {
                 if (!VerifySignature(DownloadLocation) || !CheckThumbprint(DownloadLocation)) {
                     std::error_code ec;
                     fs::remove(DownloadLocation, ec);