Fix exception being thrown on disconnect

It could happen that the socket is already closed when getting the
address, switched to the cached ip

.github/workflows/linux.yml

@@ -3,11 +3,11 @@ name: Linux
 on:
   push:
     branches:
-      - 'develop'
-      - 'minor'
+      - "develop"
+      - "minor"
   pull_request:
 
-env: 
+env:
   VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
   VCPKG_FORCE_SYSTEM_BINARIES: 1
   CMAKE_BUILD_TYPE: "Release"
@@ -19,10 +19,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: debian
-            version: 11
           - distro: debian
             version: 12
+          - distro: debian
+            version: 13
           - distro: ubuntu
             version: 22.04
           - distro: ubuntu
@@ -32,7 +32,7 @@ jobs:
     steps:
       - name: get-cmake
         uses: lukka/get-cmake@v3.28.1
-            
+
       - name: Export GitHub Actions cache environment variables
         uses: actions/github-script@v6
         with:
@@ -47,7 +47,8 @@ jobs:
 
       - uses: actions/checkout@v2
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
+          fetch-depth: 0
 
       - name: Git config safe directory
         shell: bash
@@ -90,10 +91,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: debian
-            version: 11
           - distro: debian
             version: 12
+          - distro: debian
+            version: 13
           - distro: ubuntu
             version: 22.04
           - distro: ubuntu
@@ -103,7 +104,7 @@ jobs:
     steps:
       - name: get-cmake
         uses: lukka/get-cmake@v3.28.1
-            
+
       - name: Export GitHub Actions cache environment variables
         uses: actions/github-script@v6
         with:
@@ -118,7 +119,8 @@ jobs:
 
       - uses: actions/checkout@v2
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
+          fetch-depth: 0
 
       - name: Git config safe directory
         shell: bash
@@ -153,4 +155,3 @@ jobs:
 
       - name: Test
         run: ./bin/BeamMP-Server-tests
-

.github/workflows/release.yml

@@ -3,7 +3,7 @@ on:
   push:
     # Sequence of patterns matched against refs/tags
     tags:
-    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+      - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
 
 env:
   VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
@@ -14,8 +14,8 @@ jobs:
   create-release:
     runs-on: ubuntu-latest
     name: Create Release
-    outputs: 
-      upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
       - name: Create Release
         id: create_release
@@ -38,10 +38,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: debian
-            version: 11
           - distro: debian
             version: 12
+          - distro: debian
+            version: 13
           - distro: ubuntu
             version: 22.04
           - distro: ubuntu
@@ -51,7 +51,7 @@ jobs:
     steps:
       - name: get-cmake
         uses: lukka/get-cmake@v3.28.1
-            
+
       - name: Export GitHub Actions cache environment variables
         uses: actions/github-script@v6
         with:
@@ -66,7 +66,8 @@ jobs:
 
       - uses: actions/checkout@v2
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
+          fetch-depth: 0
 
       - name: Git config safe directory
         shell: bash
@@ -82,7 +83,7 @@ jobs:
         run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
 
       - name: Upload Release Asset
-        id: upload-release-asset 
+        id: upload-release-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -109,10 +110,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: debian
-            version: 11
           - distro: debian
             version: 12
+          - distro: debian
+            version: 13
           - distro: ubuntu
             version: 22.04
           - distro: ubuntu
@@ -125,7 +126,7 @@ jobs:
     steps:
       - name: get-cmake
         uses: lukka/get-cmake@v3.28.1
-            
+
       - name: Export GitHub Actions cache environment variables
         uses: actions/github-script@v6
         with:
@@ -140,7 +141,8 @@ jobs:
 
       - uses: actions/checkout@v2
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
+          fetch-depth: 0
 
       - name: Git config safe directory
         shell: bash
@@ -156,7 +158,7 @@ jobs:
         run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
 
       - name: Upload Release Asset
-        id: upload-release-asset 
+        id: upload-release-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -193,7 +195,8 @@ jobs:
 
       - uses: actions/checkout@v2
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
+          fetch-depth: 0
 
       - name: Create Build Environment
         shell: bash
@@ -204,7 +207,7 @@ jobs:
         run: bash ./scripts/windows/2-build.sh
 
       - name: Upload Release Asset
-        id: upload-release-asset 
+        id: upload-release-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/windows.yml

@@ -26,6 +26,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
+          fetch-depth: 0
 
       - name: Setup vcpkg
         uses: lukka/run-vcpkg@v11

CMakeLists.txt

@@ -148,7 +148,8 @@ if(UNIX)
 endif(UNIX)
 
 if (WIN32)
-    add_compile_options("-D_WIN32_WINNT=0x0601")
+    add_compile_definitions(_WIN32_WINNT=0x0A00)
+
     add_compile_options("/bigobj")
 endif(WIN32)
 

include/Common.h

@@ -129,7 +129,7 @@ private:
     static inline std::mutex mShutdownHandlersMutex {};
     static inline std::deque<TShutdownHandler> mShutdownHandlers {};
 
-    static inline Version mVersion { 3, 9, 0 };
+    static inline Version mVersion { 3, 9, 2 };
 };
 
 void SplitString(std::string const& str, const char delim, std::vector<std::string>& out);

include/Env.h

@@ -26,6 +26,7 @@ enum class Key {
     // provider settings
     PROVIDER_UPDATE_MESSAGE,
     PROVIDER_DISABLE_CONFIG,
+    PROVIDER_DISABLE_MP_SET,
     PROVIDER_PORT_ENV,
     PROVIDER_IP_ENV
 };

include/LuaAPI.h

@@ -34,7 +34,7 @@ namespace MP {
     std::pair<bool, std::string> TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data);
     inline size_t GetPlayerCount() { return Engine->Server().ClientCount(); }
     std::pair<bool, std::string> DropPlayer(int ID, std::optional<std::string> MaybeReason);
-    std::pair<bool, std::string> SendChatMessage(int ID, const std::string& Message);
+    std::pair<bool, std::string> SendChatMessage(int ID, const std::string& Message, const bool& LogChat = true);
     std::pair<bool, std::string> SendNotification(int ID, const std::string& Message, const std::string& Icon, const std::string& Category);
     std::pair<bool, std::string> ConfirmationDialog(int ID, const std::string& Title, const std::string& Body, const sol::table& buttons, const std::string& InteractionID, const bool& warning = false, const bool& reportToServer = true, const bool& reportToExtensions = true);
     std::pair<bool, std::string> RemoveVehicle(int PlayerID, int VehicleID);

include/TLuaEngine.h

@@ -192,9 +192,7 @@ public:
         for (const auto& Event : mLuaEvents.at(EventName)) {
             for (const auto& Function : Event.second) {
                 if (Event.first != IgnoreId) {
-                    auto Result = EnqueueFunctionCall(Event.first, Function, Arguments, EventName);
-                    Results.push_back(Result);
-                    AddResultToCheck(Result);
+                    Results.push_back(EnqueueFunctionCall(Event.first, Function, Arguments, EventName));
                 }
             }
         }

include/TNetwork.h

@@ -34,9 +34,11 @@ public:
     [[nodiscard]] bool TCPSend(TClient& c, const std::vector<uint8_t>& Data, bool IsSync = false);
     [[nodiscard]] bool SendLarge(TClient& c, std::vector<uint8_t> Data, bool isSync = false);
     [[nodiscard]] bool Respond(TClient& c, const std::vector<uint8_t>& MSG, bool Rel, bool isSync = false);
-    std::shared_ptr<TClient> CreateClient(ip::tcp::socket&& TCPSock);
+    std::shared_ptr<TClient> CreateClient(boost::asio::ip::tcp::socket&& TCPSock);
     std::vector<uint8_t> TCPRcv(TClient& c);
     void ClientKick(TClient& c, const std::string& R);
+    void DisconnectClient(const std::weak_ptr<TClient>& c, const std::string& R);
+    void DisconnectClient(TClient& c, const std::string& R);
     [[nodiscard]] bool SyncClient(const std::weak_ptr<TClient>& c);
     void Identify(TConnection&& client);
     std::shared_ptr<TClient> Authentication(TConnection&& ClientConnection);
@@ -44,6 +46,7 @@ public:
     [[nodiscard]] bool UDPSend(TClient& Client, std::vector<uint8_t> Data);
     void SendToAll(TClient* c, const std::vector<uint8_t>& Data, bool Self, bool Rel);
     void UpdatePlayer(TClient& Client);
+    boost::system::error_code ReadWithTimeout(TConnection& Connection, void* Buf, size_t Len, std::chrono::steady_clock::duration Timeout);
 
     TResourceManager& ResourceManager() const { return mResourceManager; }
 
@@ -53,13 +56,15 @@ private:
 
     TServer& mServer;
     TPPSMonitor& mPPSMonitor;
-    ip::udp::socket mUDPSock;
+    boost::asio::ip::udp::socket mUDPSock;
     TResourceManager& mResourceManager;
     std::thread mUDPThread;
     std::thread mTCPThread;
     std::mutex mOpenIDMutex;
+    std::map<std::string, uint16_t> mClientMap;
+    std::mutex mClientMapMutex;
 
-    std::vector<uint8_t> UDPRcvFromClient(ip::udp::endpoint& ClientEndpoint);
+    std::vector<uint8_t> UDPRcvFromClient(boost::asio::ip::udp::endpoint& ClientEndpoint);
     void OnConnect(const std::weak_ptr<TClient>& c);
     void TCPClient(const std::weak_ptr<TClient>& c);
     void Looper(const std::weak_ptr<TClient>& c);
@@ -67,9 +72,9 @@ private:
     void OnDisconnect(const std::weak_ptr<TClient>& ClientPtr);
     void Parse(TClient& c, const std::vector<uint8_t>& Packet);
     void SendFile(TClient& c, const std::string& Name);
-    static bool TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Data, size_t Size);
-    static void SendFileToClient(TClient& c, size_t Size, const std::string& Name);
-    static const uint8_t* SendSplit(TClient& c, ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size);
+    static bool TCPSendRaw(TClient& C, boost::asio::ip::tcp::socket& socket, const uint8_t* Data, size_t Size);
+    void SendFileToClient(TClient& c, size_t Size, const std::string& Name);
+    static const uint8_t* SendSplit(TClient& c, boost::asio::ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size);
 };
 
 std::string HashPassword(const std::string& str);

scripts/debian-11/2-configure.sh

@@ -4,4 +4,4 @@ set -ex
 
 ./vcpkg/bootstrap-vcpkg.sh
 
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON

scripts/debian-12/2-configure.sh

@@ -4,4 +4,4 @@ set -ex
 
 ./vcpkg/bootstrap-vcpkg.sh
 
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON

scripts/debian-13/1-install-deps.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build

scripts/debian-13/1.5-git-safe.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+git config --global --add safe.directory $(pwd)
+git config --global --add safe.directory $(pwd)/vcpkg
+git config --global --add safe.directory $(pwd)/deps/commandline

scripts/debian-13/2-configure.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+./vcpkg/bootstrap-vcpkg.sh
+
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON

scripts/debian-13/3-build-tests.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server-tests

scripts/debian-13/3-build.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server
+
+objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
+objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
+
+strip -s bin/BeamMP-Server

scripts/debian-13/4-install-runtime-deps.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 curl
+

scripts/ubuntu-22.04/2-configure.sh

@@ -4,4 +4,4 @@ set -ex
 
 ./vcpkg/bootstrap-vcpkg.sh
 
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON

scripts/ubuntu-24.04/2-configure.sh

@@ -4,4 +4,4 @@ set -ex
 
 ./vcpkg/bootstrap-vcpkg.sh
 
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON

src/Env.cpp

@@ -36,6 +36,9 @@ std::string_view Env::ToString(Env::Key key) {
     case Key::PROVIDER_DISABLE_CONFIG:
         return "BEAMMP_PROVIDER_DISABLE_CONFIG";
         break;
+    case Key::PROVIDER_DISABLE_MP_SET:
+        return "BEAMMP_PROVIDER_DISABLE_MP_SET";
+        break;
     case Key::PROVIDER_PORT_ENV:
         return "BEAMMP_PROVIDER_PORT_ENV";
         break;

src/LuaAPI.cpp

@@ -178,11 +178,13 @@ std::pair<bool, std::string> LuaAPI::MP::DropPlayer(int ID, std::optional<std::s
     return { true, "" };
 }
 
-std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::string& Message) {
+std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::string& Message, const bool& LogChat) {
     std::pair<bool, std::string> Result;
     std::string Packet = "C:Server: " + Message;
     if (ID == -1) {
-        LogChatMessage("<Server> (to everyone) ", -1, Message);
+        if (LogChat) {
+            LogChatMessage("<Server> (to everyone) ", -1, Message);
+        }
         Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
         Result.first = true;
     } else {
@@ -194,7 +196,9 @@ std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::stri
                 Result.second = "Player still syncing data";
                 return Result;
             }
-            LogChatMessage("<Server> (to \"" + c->GetName() + "\")", -1, Message);
+            if (LogChat) {
+                LogChatMessage("<Server> (to \"" + c->GetName() + "\")", -1, Message);
+            }
             if (!Engine->Network().Respond(*c, StringToVector(Packet), true)) {
                 beammp_errorf("Failed to send chat message back to sender (id {}) - did the sender disconnect?", ID);
                 // TODO: should we return an error here?

src/TConsole.cpp

@@ -160,7 +160,7 @@ void TConsole::ChangeToRegularConsole() {
 }
 
 bool TConsole::EnsureArgsCount(const std::vector<std::string>& args, size_t n) {
-    if (n == 0 && args.size() != 0) {
+    if (n == 0 && !args.empty()) {
         Application::Console().WriteRaw("This command expects no arguments.");
         return false;
     } else if (args.size() != n) {
@@ -198,7 +198,7 @@ void TConsole::Command_Lua(const std::string&, const std::vector<std::string>& a
         } else {
             Application::Console().WriteRaw("Lua state '" + NewStateId + "' is not a known state. Didn't switch to Lua.");
         }
-    } else if (args.size() == 0) {
+    } else if (args.empty()) {
         ChangeToLuaConsole(mDefaultStateId);
     }
 }
@@ -423,7 +423,7 @@ void TConsole::Command_Settings(const std::string&, const std::vector<std::strin
         settings set <category> <setting> <value>   sets specified setting to value
         )";
 
-    if (args.size() == 0) {
+    if (args.empty()) {
         beammp_errorf("No arguments specified for command 'settings'!");
         Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
         return;
@@ -705,7 +705,7 @@ void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {
             }
         }
     }
-    if (NonNilFutures.size() == 0) {
+    if (NonNilFutures.empty()) {
         if (!IgnoreNotACommand) {
             Application::Console().WriteRaw("Error: Unknown command: '" + cmd + "'. Type 'help' to see a list of valid commands.");
         }

src/TLuaEngine.cpp

@@ -22,6 +22,7 @@
 #include "CustomAssert.h"
 #include "Http.h"
 #include "LuaAPI.h"
+#include "Env.h"
 #include "Profiling.h"
 #include "TLuaPlugin.h"
 #include "sol/object.hpp"
@@ -30,16 +31,12 @@
 #include <condition_variable>
 #include <fmt/core.h>
 #include <nlohmann/json.hpp>
-#include <optional>
 #include <random>
-#include <sol/stack_core.hpp>
 #include <thread>
 #include <tuple>
 
 TLuaEngine* LuaAPI::MP::Engine;
 
-static sol::protected_function AddTraceback(sol::state_view StateView, sol::protected_function RawFn);
-
 TLuaEngine::TLuaEngine()
     : mResourceServerPath(fs::path(Application::Settings.getAsString(Settings::Key::General_ResourceFolder)) / "Server") {
     Application::SetSubsystemStatus("LuaEngine", Application::Status::Starting);
@@ -131,7 +128,7 @@ void TLuaEngine::operator()() {
                 }
             }
         }
-        if (mLuaStates.size() == 0) {
+        if (mLuaStates.empty()) {
             beammp_trace("No Lua states, event loop running extremely sparsely");
             Application::SleepSafeSeconds(10);
         } else {
@@ -496,7 +493,6 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
     sol::variadic_results LocalArgs = JsonStringToArray(Str);
     for (const auto& Handler : MyHandlers) {
         auto Fn = mStateView[Handler];
-        Fn = AddTraceback(mStateView, Fn);
         if (Fn.valid()) {
             auto LuaResult = Fn(LocalArgs);
             auto Result = std::make_shared<TLuaResult>();
@@ -505,9 +501,7 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
                 Result->Result = LuaResult;
             } else {
                 Result->Error = true;
-                sol::error Err = LuaResult;
-                Result->ErrorMessage = Err.what();
-                beammp_errorf("An error occured while executing local event handler \"{}\" for event \"{}\": {}", Handler, EventName, Result->ErrorMessage);
+                Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
             }
             Result->MarkAsReady();
             Return.push_back(Result);
@@ -733,6 +727,25 @@ static void AddToTable(sol::table& table, const std::string& left, const T& valu
     }
 }
 
+static bool mDisableMPSet = [] {
+    auto DisableMPSet = Env::Get(Env::Key::PROVIDER_DISABLE_MP_SET).value_or("false");
+    return DisableMPSet == "true" || DisableMPSet == "1";
+}();
+
+static auto GetSettingName = [](int id) -> const char* {
+    switch (id) {
+        case 0: return "Debug";
+        case 1: return "Private";
+        case 2: return "MaxCars";
+        case 3: return "MaxPlayers";
+        case 4: return "Map";
+        case 5: return "Name";
+        case 6: return "Description";
+        case 7: return "InformationPacket";
+        default: return "Unknown";
+    }
+};
+
 static void JsonDecodeRecursive(sol::state_view& StateView, sol::table& table, const std::string& left, const nlohmann::json& right) {
     switch (right.type()) {
     case nlohmann::detail::value_t::null:
@@ -864,7 +877,15 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
     MPTable.set_function("GetPositionRaw", [&](int PID, int VID) -> std::pair<sol::table, std::string> {
         return Lua_GetPositionRaw(PID, VID);
     });
-    MPTable.set_function("SendChatMessage", &LuaAPI::MP::SendChatMessage);
+    MPTable.set_function("SendChatMessage", [&](sol::variadic_args Args) {
+        if (Args.size() == 2) {
+            LuaAPI::MP::SendChatMessage(Args.get<int>(0), Args.get<std::string>(1));
+        } else if (Args.size() == 3) {
+            LuaAPI::MP::SendChatMessage(Args.get<int>(0), Args.get<std::string>(1), Args.get<bool>(2));
+        } else {
+            beammp_lua_error("SendChatMessage expects 2 or 3 arguments.");
+        }
+    });
     MPTable.set_function("SendNotification", [&](sol::variadic_args Args) {
         if (Args.size() == 2) {
             LuaAPI::MP::SendNotification(Args.get<int>(0), Args.get<std::string>(1), "", Args.get<std::string>(1));
@@ -925,7 +946,13 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
     MPTable.set_function("CancelEventTimer", [&](const std::string& EventName) {
         mEngine->CancelEventTimers(EventName, mStateId);
     });
-    MPTable.set_function("Set", &LuaAPI::MP::Set);
+    if (mDisableMPSet) {
+        MPTable.set_function("Set", [this](int ConfigID, sol::object NewValue) {
+            beammp_lua_errorf("A script ({}) tried to call MP.Set to change setting '{}' but this was blocked by your server provider.", mStateId, GetSettingName(ConfigID));
+        });
+    } else {
+        MPTable.set_function("Set", &LuaAPI::MP::Set);
+    }
     MPTable.set_function("Get", &LuaAPI::MP::Get);
 
     auto UtilTable = StateView.create_named_table("Util");
@@ -1089,21 +1116,6 @@ void TLuaEngine::StateThreadData::RegisterEvent(const std::string& EventName, co
     mEngine->RegisterEvent(EventName, mStateId, FunctionName);
 }
 
-static sol::protected_function AddTraceback(sol::state_view StateView, sol::protected_function RawFn) {
-    StateView["INTERNAL_ERROR_HANDLER"] = [](lua_State *L) {
-        auto Error = sol::stack::get<std::optional<std::string>>(L);
-        std::string ErrorString = "<Unknown error>";
-        if (Error.has_value()) {
-            ErrorString = Error.value();
-        }
-        auto DebugTracebackFn = sol::state_view(L).globals().get<sol::table>("debug").get<sol::protected_function>("traceback");
-        // 2 = start collecting the trace one above the current function (1=current function)
-        std::string Traceback = DebugTracebackFn(ErrorString, 2);
-        return sol::stack::push(L, Traceback);
-    };
-    return sol::protected_function(RawFn, StateView["INTERNAL_ERROR_HANDLER"]);
-}
-
 void TLuaEngine::StateThreadData::operator()() {
     RegisterThread("Lua:" + mStateId);
     while (!Application::IsShuttingDown()) {
@@ -1168,8 +1180,8 @@ void TLuaEngine::StateThreadData::operator()() {
                 // TODO: Use TheQueuedFunction.EventName for errors, warnings, etc
                 Result->StateId = mStateId;
                 sol::state_view StateView(mState);
-                auto RawFn = StateView[FnName];
-                if (RawFn.valid() && RawFn.get_type() == sol::type::function) {
+                auto Fn = StateView[FnName];
+                if (Fn.valid() && Fn.get_type() == sol::type::function) {
                     std::vector<sol::object> LuaArgs;
                     for (const auto& Arg : Args) {
                         if (Arg.valueless_by_exception()) {
@@ -1204,7 +1216,6 @@ void TLuaEngine::StateThreadData::operator()() {
                             break;
                         }
                     }
-                    auto Fn = AddTraceback(StateView, RawFn);
                     auto Res = Fn(sol::as_args(LuaArgs));
                     if (Res.valid()) {
                         Result->Error = false;

src/TNetwork.cpp

@@ -38,6 +38,10 @@
 
 typedef boost::asio::detail::socket_option::integer<SOL_SOCKET, SO_RCVTIMEO> rcv_timeout_option;
 
+static constexpr uint8_t MAX_CONCURRENT_CONNECTIONS = 10;
+static constexpr uint8_t MAX_GLOBAL_CONNECTIONS = 128;
+static constexpr uint8_t READ_TIMEOUT_S = 10; //seconds
+
 std::vector<uint8_t> StringToVector(const std::string& Str) {
     return std::vector<uint8_t>(Str.data(), Str.data() + Str.size());
 }
@@ -89,14 +93,14 @@ void TNetwork::UDPServerMain() {
     RegisterThread("UDPServer");
 
     boost::system::error_code ec;
-    auto address = ip::make_address(Application::Settings.getAsString(Settings::Key::General_IP), ec);
+    auto address = boost::asio::ip::make_address(Application::Settings.getAsString(Settings::Key::General_IP), ec);
 
     if (ec) {
         beammp_errorf("Failed to parse IP: {}", ec.message());
         Application::GracefullyShutdown();
     }
 
-    ip::udp::endpoint UdpListenEndpoint(address, Application::Settings.getAsInt(Settings::Key::General_Port));
+    boost::asio::ip::udp::endpoint UdpListenEndpoint(address, Application::Settings.getAsInt(Settings::Key::General_Port));
 
     mUDPSock.open(UdpListenEndpoint.protocol(), ec);
     if (ec) {
@@ -121,13 +125,13 @@ void TNetwork::UDPServerMain() {
         + std::to_string(Application::Settings.getAsInt(Settings::Key::General_MaxPlayers)) + (" Clients"));
     while (!Application::IsShuttingDown()) {
         try {
-            ip::udp::endpoint remote_client_ep {};
+            boost::asio::ip::udp::endpoint remote_client_ep {};
             std::vector<uint8_t> Data = UDPRcvFromClient(remote_client_ep);
             if (Data.empty()) {
                 continue;
             }
             if (Data.size() == 1 && Data.at(0) == 'P') {
-                mUDPSock.send_to(const_buffer("P", 1), remote_client_ep, {}, ec);
+                mUDPSock.send_to(boost::asio::const_buffer("P", 1), remote_client_ep, {}, ec);
                 // ignore errors
                 (void)ec;
                 continue;
@@ -148,7 +152,7 @@ void TNetwork::UDPServerMain() {
                 }
 
                 if (Client->GetID() == ID) {
-                    if (Client->GetUDPAddr() == ip::udp::endpoint {} && !Client->IsUDPConnected() && !Client->GetMagic().empty()) {
+                    if (Client->GetUDPAddr() == boost::asio::ip::udp::endpoint {} && !Client->IsUDPConnected() && !Client->GetMagic().empty()) {
                         if (Data.size() != 66) {
                             beammp_debugf("Invalid size for UDP value. IP: {} ID: {}", remote_client_ep.address().to_string(), ID);
                             return false;
@@ -188,16 +192,16 @@ void TNetwork::TCPServerMain() {
     RegisterThread("TCPServer");
 
     boost::system::error_code ec;
-    auto address = ip::make_address(Application::Settings.getAsString(Settings::Key::General_IP), ec);
+    auto address = boost::asio::ip::make_address(Application::Settings.getAsString(Settings::Key::General_IP), ec);
     if (ec) {
         beammp_errorf("Failed to parse IP: {}", ec.message());
         return;
     }
 
-    ip::tcp::endpoint ListenEp(address,
+    boost::asio::ip::tcp::endpoint ListenEp(address,
         uint16_t(Application::Settings.getAsInt(Settings::Key::General_Port)));
 
-    ip::tcp::socket Listener(mServer.IoCtx());
+    boost::asio::ip::tcp::socket Listener(mServer.IoCtx());
     Listener.open(ListenEp.protocol(), ec);
     if (ec) {
         beammp_errorf("Failed to open socket: {}", ec.message());
@@ -222,7 +226,7 @@ void TNetwork::TCPServerMain() {
             ec.message());
     }
 
-    ip::tcp::acceptor Acceptor(mServer.IoCtx(), ListenEp);
+    boost::asio::ip::tcp::acceptor Acceptor(mServer.IoCtx(), ListenEp);
     Acceptor.listen(socket_base::max_listen_connections, ec);
     if (ec) {
         beammp_errorf("listen() failed, which is needed for the server to operate. "
@@ -239,14 +243,28 @@ void TNetwork::TCPServerMain() {
                 beammp_debug("shutdown during TCP wait for accept loop");
                 break;
             }
-            ip::tcp::endpoint ClientEp;
-            ip::tcp::socket ClientSocket = Acceptor.accept(ClientEp, ec);
-            if (ec) {
+            boost::asio::ip::tcp::endpoint ClientEp;
+            boost::asio::ip::tcp::socket ClientSocket = Acceptor.accept(ClientEp, ec);
+            std::string ClientIP = ClientEp.address().to_string();
+            if (!ec) {
+                mClientMapMutex.lock();
+                if (mClientMap[ClientIP] >= MAX_CONCURRENT_CONNECTIONS) {
+                    beammp_debugf("The connection was rejected for {}, as it had {} concurrent connections.", ClientIP, mClientMap[ClientIP]);
+                }
+                else if (mClientMap.size() >= MAX_GLOBAL_CONNECTIONS) {
+                    beammp_debugf("The connection was rejected for {}, as there are {} global connections.", ClientIP, mClientMap.size());
+                }
+                else {
+                    TConnection Conn { std::move(ClientSocket), ClientEp };
+                    std::thread ID(&TNetwork::Identify, this, std::move(Conn));
+                    ID.detach(); // TODO: Add to a queue and attempt to join periodically
+                    mClientMap[ClientIP]++;
+                }
+                mClientMapMutex.unlock();
+            }
+            else {
                 beammp_errorf("Failed to accept() new client: {}", ec.message());
             }
-            TConnection Conn { std::move(ClientSocket), ClientEp };
-            std::thread ID(&TNetwork::Identify, this, std::move(Conn));
-            ID.detach(); // TODO: Add to a queue and attempt to join periodically
         } catch (const std::exception& e) {
             beammp_errorf("Exception in accept routine: {}", e.what());
         }
@@ -262,11 +280,22 @@ void TNetwork::Identify(TConnection&& RawConnection) {
     RegisterThreadAuto();
     char Code;
 
-    boost::system::error_code ec;
-    read(RawConnection.Socket, buffer(&Code, 1), ec);
+    boost::system::error_code ec = ReadWithTimeout(RawConnection, &Code, 1, std::chrono::seconds(READ_TIMEOUT_S));
     if (ec) {
         // TODO: is this right?!
+        beammp_debug("Error occured reading code");
         RawConnection.Socket.shutdown(socket_base::shutdown_both, ec);
+        mClientMapMutex.lock();
+        {
+            std::string ClientIP = RawConnection.SockAddr.address().to_string();
+            if (mClientMap[ClientIP] > 0) {
+                mClientMap[ClientIP]--;
+            }
+            if (mClientMap[ClientIP] == 0) {
+                mClientMap.erase(ClientIP);
+            }
+        }
+        mClientMapMutex.unlock();
         return;
     }
     std::shared_ptr<TClient> Client { nullptr };
@@ -277,8 +306,7 @@ void TNetwork::Identify(TConnection&& RawConnection) {
             beammp_errorf("Old download packet detected - the client is wildly out of date, this will be ignored");
             return;
         } else if (Code == 'P') {
-            boost::system::error_code ec;
-            write(RawConnection.Socket, buffer("P"), ec);
+            boost::asio::write(RawConnection.Socket, boost::asio::buffer("P"), ec);
             return;
         } else if (Code == 'I') {
             const std::string Data = Application::Settings.getAsBool(Settings::Key::General_InformationPacket) ? THeartbeatThread::lastCall : "";
@@ -290,14 +318,25 @@ void TNetwork::Identify(TConnection&& RawConnection) {
             std::memcpy(ToSend.data() + sizeof(Size), Data.data(), Data.size());
 
             boost::system::error_code ec;
-            write(RawConnection.Socket, buffer(ToSend), ec);
+            boost::asio::write(RawConnection.Socket, boost::asio::buffer(ToSend), ec);
         } else {
             beammp_errorf("Invalid code got in Identify: '{}'", Code);
         }
     } catch (const std::exception& e) {
         beammp_errorf("Error during handling of code {} - client left in invalid state, closing socket: {}", Code, e.what());
         boost::system::error_code ec;
-        RawConnection.Socket.shutdown(socket_base::shutdown_both, ec);
+        RawConnection.Socket.shutdown(boost::asio::socket_base::shutdown_both, ec);
+        mClientMapMutex.lock();
+        {
+            std::string ClientIP = RawConnection.SockAddr.address().to_string();
+            if (mClientMap[ClientIP] > 0) {
+                mClientMap[ClientIP]--;
+            }
+            if (mClientMap[ClientIP] == 0) {
+                mClientMap.erase(ClientIP);
+            }
+        }
+        mClientMapMutex.unlock();
         if (ec) {
             beammp_debugf("Failed to shutdown client socket: {}", ec.message());
         }
@@ -395,7 +434,7 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
     try {
         nlohmann::json AuthRes = nlohmann::json::parse(AuthResStr);
 
-        if (AuthRes["username"].is_string() && AuthRes["roles"].is_string()
+        if (AuthRes["username"].is_string() && AuthRes["username"].size() > 0 && AuthRes["roles"].is_string()
             && AuthRes["guest"].is_boolean() && AuthRes["identifiers"].is_array()) {
 
             Client->SetName(AuthRes["username"]);
@@ -429,7 +468,7 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
                 return true;
         }
         if (Cl->GetName() == Client->GetName() && Cl->IsGuest() == Client->IsGuest()) {
-            Cl->Disconnect("Stale Client (not a real player)");
+            DisconnectClient(Cl, "Stale Client (not a real player)");
             return false;
         }
 
@@ -492,7 +531,7 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
     return Client;
 }
 
-std::shared_ptr<TClient> TNetwork::CreateClient(ip::tcp::socket&& TCPSock) {
+std::shared_ptr<TClient> TNetwork::CreateClient(boost::asio::ip::tcp::socket&& TCPSock) {
     auto c = std::make_shared<TClient>(mServer, std::move(TCPSock));
     return c;
 }
@@ -525,10 +564,10 @@ bool TNetwork::TCPSend(TClient& c, const std::vector<uint8_t>& Data, bool IsSync
     std::memcpy(ToSend.data(), &Size, sizeof(Size));
     std::memcpy(ToSend.data() + sizeof(Size), Data.data(), Data.size());
     boost::system::error_code ec;
-    write(Sock, buffer(ToSend), ec);
+    boost::asio::write(Sock, boost::asio::buffer(ToSend), ec);
     if (ec) {
         beammp_debugf("write(): {}", ec.message());
-        c.Disconnect("write() failed");
+        DisconnectClient(c, "write() failed");
         return false;
     }
     c.UpdatePingTime();
@@ -546,7 +585,7 @@ std::vector<uint8_t> TNetwork::TCPRcv(TClient& c) {
 
     boost::system::error_code ec;
     std::array<uint8_t, sizeof(Header)> HeaderData;
-    read(Sock, buffer(HeaderData), ec);
+    boost::asio::read(Sock, boost::asio::buffer(HeaderData), ec);
     if (ec) {
         // TODO: handle this case (read failed)
         beammp_debugf("TCPRcv: Reading header failed: {}", ec.message());
@@ -562,14 +601,16 @@ std::vector<uint8_t> TNetwork::TCPRcv(TClient& c) {
 
     std::vector<uint8_t> Data;
     // TODO: This is arbitrary, this needs to be handled another way
-    if (Header < int32_t(100 * MB)) {
+    bool isUnauthenticated = c.GetName().empty();
+    int32_t maxHeaderSize = isUnauthenticated ? 4096 : int32_t(100 * MB);
+    if (Header < maxHeaderSize) {
         Data.resize(Header);
     } else {
         ClientKick(c, "Header size limit exceeded");
-        beammp_warn("Client " + c.GetName() + " (" + std::to_string(c.GetID()) + ") sent header of >100MB - assuming malicious intent and disconnecting the client.");
+        beammp_warn("Client " + c.GetName() + " (" + std::to_string(c.GetID()) + ") sent header larger than expected - assuming malicious intent and disconnecting the client.");
         return {};
     }
-    auto N = read(Sock, buffer(Data), ec);
+    auto N = boost::asio::read(Sock, boost::asio::buffer(Data), ec);
     if (ec) {
         // TODO: handle this case properly
         beammp_debugf("TCPRcv: Reading data failed: {}", ec.message());
@@ -604,7 +645,32 @@ void TNetwork::ClientKick(TClient& c, const std::string& R) {
     if (!TCPSend(c, StringToVector("K" + R))) {
         beammp_debugf("tried to kick player '{}' (id {}), but was already disconnected", c.GetName(), c.GetID());
     }
-    c.Disconnect("Kicked");
+    DisconnectClient(c, "Kicked");
+}
+
+void TNetwork::DisconnectClient(const std::weak_ptr<TClient> &c, const std::string &R)
+{
+    if (auto locked = c.lock()) {
+        DisconnectClient(*locked, R);
+    }
+    else {
+        beammp_debugf("Tried to disconnect a non existant client with reason: {}", R);
+    }
+}
+
+void TNetwork::DisconnectClient(TClient &c, const std::string &R)
+{
+    if (c.IsDisconnected()) return;
+    std::string ClientIP = c.GetIdentifiers().at("ip");
+    mClientMapMutex.lock();
+    if (mClientMap[ClientIP] > 0) {
+        mClientMap[ClientIP]--;
+    }
+    if (mClientMap[ClientIP] == 0) {
+        mClientMap.erase(ClientIP);
+    }
+    mClientMapMutex.unlock();
+    c.Disconnect(R);
 }
 
 void TNetwork::Looper(const std::weak_ptr<TClient>& c) {
@@ -629,7 +695,7 @@ void TNetwork::Looper(const std::weak_ptr<TClient>& c) {
                 } // end locked context
                 // beammp_debug("sending a missed packet: " + QData);
                 if (!TCPSend(*Client, QData, true)) {
-                    Client->Disconnect("Failed to TCPSend while clearing the missed packet queue");
+                    DisconnectClient(Client, "Failed to TCPSend while clearing the missed packet queue");
                     std::unique_lock lock(Client->MissedPacketQueueMutex());
                     while (!Client->MissedPacketQueue().empty()) {
                         Client->MissedPacketQueue().pop();
@@ -666,10 +732,16 @@ void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
         auto res = TCPRcv(*Client);
         if (res.empty()) {
             beammp_debug("TCPRcv empty");
-            Client->Disconnect("TCPRcv failed");
+            DisconnectClient(Client, "TCPRcv failed");
+            break;
+        }
+        try {
+            mServer.GlobalParser(c, std::move(res), mPPSMonitor, *this, false);
+        } catch (const std::exception& e) {
+            beammp_warnf("Failed to receive/parse packet via TCP from client {}: {}", Client->GetID(), e.what());
+            DisconnectClient(Client, "Failed to parse packet");
             break;
         }
-        mServer.GlobalParser(c, std::move(res), mPPSMonitor, *this, false);
     }
 
     if (QueueSync.joinable())
@@ -698,6 +770,34 @@ void TNetwork::UpdatePlayer(TClient& Client) {
     //(void)Respond(Client, Packet, true);
 }
 
+boost::system::error_code TNetwork::ReadWithTimeout(TConnection& Connection, void *Buf, size_t Len, std::chrono::steady_clock::duration Timeout)
+{
+    io_context TimerIO;
+    steady_timer Timer(TimerIO);
+    Timer.expires_after(Timeout);
+
+    std::atomic<bool> TimedOut = false;
+
+    Timer.async_wait([&](const boost::system::error_code& ec) {
+        if (!ec) {
+            TimedOut = true;
+            Connection.Socket.cancel();
+        }
+    });
+    std::thread TimerThread([&]() { TimerIO.run(); });
+
+    boost::system::error_code ReadEc;
+    boost::asio::read(Connection.Socket, boost::asio::buffer(Buf, Len), ReadEc);
+
+    TimerIO.stop();
+    TimerThread.join();
+
+    if (TimedOut.load()) {
+        return error::timed_out; // synthesize a clean timeout error
+    }
+    return ReadEc; //Succes!
+}
+
 void TNetwork::OnDisconnect(const std::weak_ptr<TClient>& ClientPtr) {
     std::shared_ptr<TClient> LockedClientPtr { nullptr };
     try {
@@ -725,7 +825,7 @@ void TNetwork::OnDisconnect(const std::weak_ptr<TClient>& ClientPtr) {
     Packet.clear();
     auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerDisconnect", "", c.GetID());
     LuaAPI::MP::Engine->WaitForAll(Futures);
-    c.Disconnect("Already Disconnected (OnDisconnect)");
+    DisconnectClient(c, "Already Disconnected (OnDisconnect)");
     mServer.RemoveClient(ClientPtr);
 }
 
@@ -833,7 +933,7 @@ void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
     for (auto mod : mResourceManager.GetMods()) {
         if (mod["file_name"].get<std::string>() == FileName && mod["protected"] == true) {
             beammp_warn("Client tried to access protected file " + UnsafeName);
-            c.Disconnect("Mod is protected thus cannot be downloaded");
+            DisconnectClient(c, "Mod is protected thus cannot be downloaded");
             return;
         }
     }
@@ -897,7 +997,7 @@ void TNetwork::SendFileToClient(TClient& c, size_t Size, const std::string& Name
         Data.resize(Split);
     else
         Data.resize(Size);
-    ip::tcp::socket* TCPSock = &c.GetTCPSock();
+    boost::asio::ip::tcp::socket* TCPSock = &c.GetTCPSock();
     std::streamsize Sent = 0;
     while (!c.IsDisconnected() && Sent < Size) {
         size_t Diff = Size - Sent;
@@ -906,7 +1006,7 @@ void TNetwork::SendFileToClient(TClient& c, size_t Size, const std::string& Name
             f.read(reinterpret_cast<char*>(Data.data()), Split);
             if (!TCPSendRaw(c, *TCPSock, Data.data(), Split)) {
                 if (!c.IsDisconnected())
-                    c.Disconnect("TCPSendRaw failed in mod download (1)");
+                    DisconnectClient(c, "TCPSendRaw failed in mod download (1)");
                 break;
             }
             Sent += Split;
@@ -915,7 +1015,7 @@ void TNetwork::SendFileToClient(TClient& c, size_t Size, const std::string& Name
             f.read(reinterpret_cast<char*>(Data.data()), Diff);
             if (!TCPSendRaw(c, *TCPSock, Data.data(), int32_t(Diff))) {
                 if (!c.IsDisconnected())
-                    c.Disconnect("TCPSendRaw failed in mod download (2)");
+                    DisconnectClient(c, "TCPSendRaw failed in mod download (2)");
                 break;
             }
             Sent += Diff;
@@ -924,9 +1024,9 @@ void TNetwork::SendFileToClient(TClient& c, size_t Size, const std::string& Name
 #endif
 }
 
-bool TNetwork::TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Data, size_t Size) {
+bool TNetwork::TCPSendRaw(TClient& C, boost::asio::ip::tcp::socket& socket, const uint8_t* Data, size_t Size) {
     boost::system::error_code ec;
-    write(socket, buffer(Data, Size), ec);
+    boost::asio::write(socket, boost::asio::buffer(Data, Size), ec);
     if (ec) {
         beammp_errorf("Failed to send raw data to client: {}", ec.message());
         return false;
@@ -1067,20 +1167,20 @@ bool TNetwork::UDPSend(TClient& Client, std::vector<uint8_t> Data) {
         CompressProperly(Data);
     }
     boost::system::error_code ec;
-    mUDPSock.send_to(buffer(Data), Addr, 0, ec);
+    mUDPSock.send_to(boost::asio::buffer(Data), Addr, 0, ec);
     if (ec) {
         beammp_debugf("UDP sendto() failed: {}", ec.message());
         if (!Client.IsDisconnected())
-            Client.Disconnect("UDP send failed");
+            DisconnectClient(Client, "UDP send failed");
         return false;
     }
     return true;
 }
 
-std::vector<uint8_t> TNetwork::UDPRcvFromClient(ip::udp::endpoint& ClientEndpoint) {
+std::vector<uint8_t> TNetwork::UDPRcvFromClient(boost::asio::ip::udp::endpoint& ClientEndpoint) {
     std::array<char, 1024> Ret {};
     boost::system::error_code ec;
-    const auto Rcv = mUDPSock.receive_from(mutable_buffer(Ret.data(), Ret.size()), ClientEndpoint, 0, ec);
+    const auto Rcv = mUDPSock.receive_from(boost::asio::mutable_buffer(Ret.data(), Ret.size()), ClientEndpoint, 0, ec);
     if (ec) {
         beammp_errorf("UDP recvfrom() failed: {}", ec.message());
         return {};

src/TServer.cpp

@@ -28,6 +28,7 @@
 #include <any>
 #include <optional>
 #include <sstream>
+#include <utility>
 
 #include <nlohmann/json.hpp>
 
@@ -53,7 +54,6 @@ static std::optional<std::pair<int, int>> GetPidVid(const std::string& str) {
     }
     return std::nullopt;
 }
-
 TEST_CASE("GetPidVid") {
     SUBCASE("Valid singledigit") {
         const auto MaybePidVid = GetPidVid("0-1");
@@ -120,7 +120,6 @@ TEST_CASE("GetPidVid") {
         CHECK(!MaybePidVid);
     }
 }
-
 TServer::TServer(const std::vector<std::string_view>& Arguments) {
     beammp_info("BeamMP Server v" + Application::ServerVersionString());
     Application::SetSubsystemStatus("Server", Application::Status::Starting);
@@ -198,7 +197,8 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
         int PID = -1;
         int VID = -1;
 
-        auto MaybePidVid = GetPidVid(StringPacket.substr(3).substr(0, StringPacket.substr(3).find(':', 1)));
+        auto pidVidPart = StringPacket.substr(3);
+        auto MaybePidVid = GetPidVid(pidVidPart.substr(0, pidVidPart.find(':')));
         if (MaybePidVid) {
             std::tie(PID, VID) = MaybePidVid.value();
         }
@@ -256,6 +256,10 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
             beammp_debugf("Empty chat message received from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
             return;
         }
+        if (Message.size() > 500) {
+           beammp_debugf("Chat message too long from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
+           return;
+        }
         auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", LockedClient->GetID(), LockedClient->GetName(), Message);
         TLuaEngine::WaitForAll(Futures);
         LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), PacketAsString.substr(PacketAsString.find(':', 3) + 1));
@@ -289,7 +293,8 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
         int PID = -1;
         int VID = -1;
 
-        auto MaybePidVid = GetPidVid(StringPacket.substr(3).substr(0, StringPacket.substr(3).find(':', 1)));
+        auto pidVidPart = StringPacket.substr(3);
+        auto MaybePidVid = GetPidVid(pidVidPart.substr(0, pidVidPart.find(':')));
         if (MaybePidVid) {
             std::tie(PID, VID) = MaybePidVid.value();
         }
@@ -466,7 +471,13 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
         }
 
         if (PID != -1 && VID != -1 && PID == c.GetID()) {
-            Data = Data.substr(Data.find('{'));
+            auto BracketPos = Data.find('{');
+            if (BracketPos == std::string::npos) {
+                beammp_debugf("Invalid 'Or' packet body from client {}", c.GetID());
+                return;
+            }
+
+            Data = Data.substr(BracketPos);
             LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleReset", "", c.GetID(), VID, Data));
             Network.SendToAll(&c, StringToVector(Packet), false, true);
         }
@@ -495,7 +506,14 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
         }
 
         if (PID != -1 && VID != -1 && PID == c.GetID()) {
-            Data = Data.substr(Data.find('['));
+            auto BracketPos = Data.find('[');
+            if (BracketPos == std::string::npos) {
+                beammp_debugf("Invalid 'Op' packet body from client {}", c.GetID());
+                return;
+            }
+
+            Data = Data.substr(BracketPos);
+
             LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehiclePaintChanged", "", c.GetID(), VID, Data));
             Network.SendToAll(&c, StringToVector(Packet), false, true);
 

vcpkg.json

@@ -14,6 +14,18 @@
     "openssl",
     "rapidjson",
     "sol2",
-    "curl"
-  ]
+    "curl",
+    "lua"
+  ],
+  "overrides": [
+    {
+      "name": "sol2",
+      "version": "3.3.1"
+    },
+    {
+      "name": "lua",
+      "version": "5.3.5#6"
+    }
+  ],
+  "builtin-baseline": "5bf0c55239da398b8c6f450818c9e28d36bf9966"
 }