gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2025-12-24 20:10:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

use correct settings group for command interval settings (#4257)

Browse Source 
the settings command_counting_interval and
max_command_count_per_interval are now in the [security] group as hinted
by their location in servatrice.ini.example

check values of comand interval settings before use
This commit is contained in:
ebbit1q
2021-03-08 18:18:22 +01:00
committed by GitHub
parent aa6a0313e9
commit 7e3a669af0
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/server_protocolhandler.cpp
View File

@@ -286,11 +286,13 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const
if (!antifloodCommandsWhiteList.contains((GameCommand::GameCommandType)getPbExtension(sc)))
++commandCountOverTime[0];
for (int i = 0; i < commandCountOverTime.size(); ++i)
for (int i = 0; i < commandCountOverTime.size(); ++i) {
totalCount += commandCountOverTime[i];
}
if (totalCount > maxCommandCountPerInterval)
if (maxCommandCountPerInterval > 0 && totalCount > maxCommandCountPerInterval) {
return Response::RespChatFlood;
}
}
Response::ResponseCode resp = player->processGameCommand(sc, rc, ges);
@@ -733,12 +735,16 @@ Server_ProtocolHandler::cmdRoomSay(const Command_RoomSay &cmd, Server_Room *room
if (messageCountOverTime.isEmpty())
messageCountOverTime.prepend(0);
++messageCountOverTime[0];
for (int i = 0; i < messageCountOverTime.size(); ++i)
for (int i = 0; i < messageCountOverTime.size(); ++i) {
totalCount += messageCountOverTime[i];
}
if ((totalSize > server->getMaxMessageSizePerInterval()) ||
(totalCount > server->getMaxMessageCountPerInterval()))
int maxMessageSizePerInterval = server->getMaxMessageSizePerInterval();
int maxMessageCountPerInterval = server->getMaxMessageCountPerInterval();
if ((maxMessageSizePerInterval > 0 && totalSize > maxMessageSizePerInterval) ||
(maxMessageCountPerInterval > 0 && totalCount > maxMessageCountPerInterval)) {
return Response::RespChatFlood;
}
}
msg.replace(QChar('\n'), QChar(' '));