From 06db6d0341148a7bd38ab0cbe2665b497b3cef48 Mon Sep 17 00:00:00 2001 From: Tixx <83774803+WiserTixx@users.noreply.github.com> Date: Sun, 11 Aug 2024 12:10:33 +0200 Subject: [PATCH] Implement mod warning --- include/Network/network.hpp | 2 ++ src/Network/Core.cpp | 47 ++++++++++++++++++++++++++++++------- src/Network/Resources.cpp | 9 ++++--- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/include/Network/network.hpp b/include/Network/network.hpp index 5c0b2b3..f2a0a00 100644 --- a/include/Network/network.hpp +++ b/include/Network/network.hpp @@ -52,3 +52,5 @@ void TCPSend(const std::string& Data, uint64_t Sock); void TCPClientMain(const std::string& IP, int Port); void UDPClientMain(const std::string& IP, int Port); void TCPGameServer(const std::string& IP, int Port); +bool SecurityWarning(); +void CoreSend(std::string data); diff --git a/src/Network/Core.cpp b/src/Network/Core.cpp index 3ee86b9..ceefdc7 100644 --- a/src/Network/Core.cpp +++ b/src/Network/Core.cpp @@ -44,6 +44,26 @@ std::string UlStatus; std::string MStatus; bool ModLoaded; int ping = -1; +SOCKET CoreSocket = -1; +signed char confirmed = -1; + +bool SecurityWarning() { + confirmed = -1; + CoreSend("WMODS_FOUND"); + + while (confirmed == -1) + std::this_thread::sleep_for(std::chrono::milliseconds(10)); + + if (confirmed == 1) + return true; + + NetReset(); + Terminate = true; + TCPTerminate = true; + ping = -1; + + return false; +} void StartSync(const std::string& Data) { std::string IP = GetAddr(Data.substr(1, Data.find(':') - 1)); @@ -67,6 +87,15 @@ void StartSync(const std::string& Data) { info("Connecting to server"); } +void CoreSend(std::string data) { + if (CoreSocket != -1) { + int res = send(CoreSocket, (data + "\n").c_str(), int(data.size()) + 1, 0); + if (res < 0) { + debug("(Core) send failed with error: " + std::to_string(WSAGetLastError())); + } + } +} + bool IsAllowedLink(const std::string& Link) { std::regex link_pattern(R"(https:\/\/(?:\w+)?(?:\.)?(?:beammp\.com|discord\.gg|patreon\.com\/BeamMP))"); std::smatch link_match; @@ -90,13 +119,6 @@ void Parse(std::string Data, SOCKET CSocket) { case 'C': ListOfMods.clear(); StartSync(Data); - while (ListOfMods.empty() && !Terminate) { - std::this_thread::sleep_for(std::chrono::seconds(1)); - } - if (ListOfMods == "-") - Data = "L"; - else - Data = "L" + ListOfMods; break; case 'O': // open default browser with URL if (IsAllowedLink(Data.substr(1))) { @@ -189,6 +211,15 @@ void Parse(std::string Data, SOCKET CSocket) { Data = "N" + Login(Data.substr(Data.find(':') + 1)); } break; + case 'W': + if (SubCode == 'Y') { + confirmed = 1; + } else if (SubCode == 'N') { + confirmed = 0; + } + + Data.clear(); + break; default: Data.clear(); break; @@ -201,7 +232,7 @@ void Parse(std::string Data, SOCKET CSocket) { } } void GameHandler(SOCKET Client) { - + CoreSocket = Client; int32_t Size, Temp, Rcv; char Header[10] = { 0 }; do { diff --git a/src/Network/Resources.cpp b/src/Network/Resources.cpp index 74ae789..be3feb7 100644 --- a/src/Network/Resources.cpp +++ b/src/Network/Resources.cpp @@ -98,7 +98,7 @@ std::string Auth(SOCKET Sock) { if (Res.empty() || Res == "-") { info("Didn't Receive any mods..."); - ListOfMods = "-"; + CoreSend("L"); TCPSend("Done", Sock); info("Done!"); return ""; @@ -229,6 +229,9 @@ void SyncResources(SOCKET Sock) { if (Ret.empty()) return; + if (!SecurityWarning()) + return; + info("Checking Resources..."); CheckForDir(); @@ -246,9 +249,9 @@ void SyncResources(SOCKET Sock) { } } if (t.empty()) - ListOfMods = "-"; + CoreSend("L"); else - ListOfMods = t; + CoreSend("L" + t); t.clear(); for (auto FN = FNames.begin(), FS = FSizes.begin(); FN != FNames.end() && !Terminate; ++FN, ++FS) { auto pos = FN->find_last_of('/');