thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix srvbans.json saving and warn on invalid IP instead of throw

Browse source
This commit is contained in:
Eidolon 2025-07-15 17:10:17 -05:00
parent 23b4b83c7c
commit 1094166cd9
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/k_bans.cpp
View file

@ -53,6 +53,7 @@ static uint8_t allZero[PUBKEYLENGTH];
static void load_bans_array_v1(const JsonArray& array) static void load_bans_array_v1(const JsonArray& array)
{ {
int index = 0;
for (const JsonValue& object : array) for (const JsonValue& object : array)
{ {
uint8_t public_key_bin[PUBKEYLENGTH]; uint8_t public_key_bin[PUBKEYLENGTH];
@ -80,8 +81,9 @@ static void load_bans_array_v1(const JsonArray& array)
if (!banned) if (!banned)
{ {
throw std::runtime_error(fmt::format("{}: IP address is invalid", ip_address)); CONS_Alert(CONS_WARNING, "IP address of ban entry %d invalid\n", index);
} }
index++;
} }
} }
@ -163,14 +165,14 @@ void SV_SaveBans(void)
if (ban.deleted) if (ban.deleted)
continue; continue;
array.push_back(JsonObject { JsonObject ban_obj;
{"public_key", GetPrettyRRID(ban.public_key, false)}, ban_obj["public_key"] = srb2::String(GetPrettyRRID(ban.public_key, false));
{"ip_address", SOCK_AddrToStr(ban.address)}, ban_obj["ip_address"] = srb2::String(SOCK_AddrToStr(ban.address));
{"subnet_mask", ban.mask}, ban_obj["subnet_mask"] = ban.mask;
{"expires", static_cast<int64_t>(ban.expires)}, ban_obj["expires"] = static_cast<int64_t>(ban.expires);
{"username", ban.username}, ban_obj["username"] = srb2::String(ban.username);
{"reason", ban.reason}, ban_obj["reason"] = srb2::String(ban.reason);
}); array.push_back(std::move(ban_obj));
} }
srb2::String json_string = object.to_json_string(); srb2::String json_string = object.to_json_string();