Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[RCon]: Fix issue with IW4M (#769)

Browse Source
This commit is contained in:
Edo 2023-02-10 15:04:19 +00:00 committed by GitHub
parent e924c2907f
commit 2366fd6122
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Components/Modules/RCon.cpp
View File

@ -15,6 +15,7 @@ namespace Components
Dvar::Var RCon::RconPassword; Dvar::Var RCon::RconPassword;
Dvar::Var RCon::RconLogRequests; Dvar::Var RCon::RconLogRequests;
Dvar::Var RCon::RconTimeout;
void RCon::AddCommands() void RCon::AddCommands()
{ {
@ -77,6 +78,16 @@ namespace Components
}); });
} }
bool RCon::IsRateLimitCheckDisabled()
{
static std::optional<bool> flag;
if (!flag.has_value())
{
flag.emplace(Flags::HasFlag("disable-rate-limit-check"));
}
return flag.value();
}
bool RCon::RateLimitCheck(const Network::Address& address, const int time) bool RCon::RateLimitCheck(const Network::Address& address, const int time)
{ {
const auto ip = address.getIP(); const auto ip = address.getIP();
@ -88,8 +99,7 @@ namespace Components
const auto lastTime = RateLimit[ip.full]; const auto lastTime = RateLimit[ip.full];
// Only one request every 500ms if (lastTime && (time - lastTime) < RconTimeout.get<int>())
if (lastTime && (time - lastTime) < 500)
{ {
return false; // Flooding return false; // Flooding
} }
@ -103,7 +113,7 @@ namespace Components
for (auto i = RateLimit.begin(); i != RateLimit.end();) for (auto i = RateLimit.begin(); i != RateLimit.end();)
{ {
// No longer at risk of flooding, remove // No longer at risk of flooding, remove
if ((time - i->second) > 500) if ((time - i->second) > RconTimeout.get<int>())
{ {
i = RateLimit.erase(i); i = RateLimit.erase(i);
} }
@ -164,13 +174,14 @@ namespace Components
Events::OnDvarInit([] Events::OnDvarInit([]
{ {
RconPassword = Dvar::Register<const char*>("rcon_password", "", Game::DVAR_NONE, "The password for rcon"); RconPassword = Dvar::Register<const char*>("rcon_password", "", Game::DVAR_NONE, "The password for rcon");
RconLogRequests = Dvar::Register<bool>("rcon_log_requests", false, Game::DVAR_NONE, "Print remote commands in the output log"); RconLogRequests = Dvar::Register<bool>("rcon_log_requests", false, Game::DVAR_NONE, "Print remote commands in log");
RconTimeout = Dvar::Register<int>("rcon_timeout", 500, 500, 10000, Game::DVAR_NONE, "");
}); });
Network::OnClientPacket("rcon", [](const Network::Address& address, [[maybe_unused]] const std::string& data) Network::OnClientPacket("rcon", [](const Network::Address& address, [[maybe_unused]] const std::string& data)
{ {
const auto time = Game::Sys_Milliseconds(); const auto time = Game::Sys_Milliseconds();
if (!RateLimitCheck(address, time)) if (!IsRateLimitCheckDisabled() && !RateLimitCheck(address, time))
{ {
return; return;
} }

2
src/Components/Modules/RCon.hpp
View File

@ -38,9 +38,11 @@ namespace Components
static Dvar::Var RconPassword; static Dvar::Var RconPassword;
static Dvar::Var RconLogRequests; static Dvar::Var RconLogRequests;
static Dvar::Var RconTimeout;
static void AddCommands(); static void AddCommands();
static bool IsRateLimitCheckDisabled();
static bool RateLimitCheck(const Network::Address& address, int time); static bool RateLimitCheck(const Network::Address& address, int time);
static void RateLimitCleanup(int time); static void RateLimitCleanup(int time);
}; };