mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-25 03:41:02 +00:00
Catch several ways ban.txt could be malformed by a well-meaning server host, and report it back via the log.
This commit is contained in:
parent
36e44f2f6f
commit
fbb613b2d6
1 changed files with 37 additions and 6 deletions
|
@ -2790,6 +2790,7 @@ void D_LoadBan(boolean warning)
|
|||
time_t unbanTime = NO_BAN_TIME;
|
||||
char buffer[MAX_WADPATH];
|
||||
UINT8 banmode = 0;
|
||||
boolean malformed = false;
|
||||
|
||||
if (!I_ClearBans)
|
||||
return;
|
||||
|
@ -2814,8 +2815,11 @@ void D_LoadBan(boolean warning)
|
|||
mask = strtok(NULL, " \t\r\n");
|
||||
|
||||
if (i == 0 && !strncmp(address, "BANFORMAT", 9))
|
||||
{
|
||||
if (mask)
|
||||
{
|
||||
banmode = atoi(mask);
|
||||
}
|
||||
switch (banmode)
|
||||
{
|
||||
case BANFORMAT: // currently supported format
|
||||
|
@ -2824,32 +2828,56 @@ void D_LoadBan(boolean warning)
|
|||
default:
|
||||
{
|
||||
fclose(f);
|
||||
CONS_Alert(CONS_WARNING, "Could not load unknown ban.txt for ban list (BANFORMAT %d, expected %d)\n", banmode, BANFORMAT);
|
||||
CONS_Alert(CONS_WARNING, "Could not load unknown ban.txt for ban list (BANFORMAT %s, expected %d)\n", mask, BANFORMAT);
|
||||
return;
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (I_SetBanAddress(address, mask) == false) // invalid IP input?
|
||||
{
|
||||
CONS_Alert(CONS_WARNING, "\"%s/%s\" is not a valid IP address, discarding...\n", address, mask);
|
||||
continue;
|
||||
}
|
||||
|
||||
// One-way legacy format conversion -- the game will crash otherwise
|
||||
if (banmode == 0)
|
||||
{
|
||||
unbanTime = NO_BAN_TIME;
|
||||
username = NULL; // not guaranteed to be accurate, but only sane substitute
|
||||
reason = strtok(NULL, "\r\n");
|
||||
if (reason[0] == 'N' && reason[1] == 'A' && reason[2] == '\0')
|
||||
if (reason && reason[0] == 'N' && reason[1] == 'A' && reason[2] == '\0')
|
||||
{
|
||||
reason = NULL;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
unbanTime = atoi(strtok(NULL, " \"\t\r\n"));
|
||||
reason = strtok(NULL, " \"\t\r\n");
|
||||
if (reason)
|
||||
{
|
||||
unbanTime = atoi(reason);
|
||||
reason = NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
unbanTime = NO_BAN_TIME;
|
||||
malformed = true;
|
||||
}
|
||||
|
||||
username = strtok(NULL, "\"\t\r\n"); // go until next "
|
||||
if (!username)
|
||||
{
|
||||
malformed = true;
|
||||
}
|
||||
|
||||
strtok(NULL, "\"\t\r\n"); // remove first "
|
||||
reason = strtok(NULL, "\"\r\n"); // go until next "
|
||||
if (!reason)
|
||||
{
|
||||
malformed = true;
|
||||
}
|
||||
}
|
||||
|
||||
// Enforce MAX_REASONLENGTH.
|
||||
|
@ -2865,8 +2893,6 @@ void D_LoadBan(boolean warning)
|
|||
}
|
||||
}
|
||||
|
||||
I_SetBanAddress(address, mask);
|
||||
|
||||
if (I_SetUnbanTime)
|
||||
I_SetUnbanTime(unbanTime);
|
||||
|
||||
|
@ -2877,6 +2903,11 @@ void D_LoadBan(boolean warning)
|
|||
I_SetBanReason(reason);
|
||||
}
|
||||
|
||||
if (malformed)
|
||||
{
|
||||
CONS_Alert(CONS_WARNING, "One or more lines of ban.txt are malformed. The game can correct for this, but some data may be lost.\n");
|
||||
}
|
||||
|
||||
fclose(f);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue