aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show stats 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))) if (!antifloodCommandsWhiteList.contains((GameCommand::GameCommandType)getPbExtension(sc)))
++commandCountOverTime[0]; ++commandCountOverTime[0];
for (int i = 0; i < commandCountOverTime.size(); ++i) for (int i = 0; i < commandCountOverTime.size(); ++i) {
totalCount += commandCountOverTime[i]; totalCount += commandCountOverTime[i];
}
if (totalCount > maxCommandCountPerInterval) if (maxCommandCountPerInterval > 0 && totalCount > maxCommandCountPerInterval) {
return Response::RespChatFlood; return Response::RespChatFlood;
}
} }
Response::ResponseCode resp = player->processGameCommand(sc, rc, ges); 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()) if (messageCountOverTime.isEmpty())
messageCountOverTime.prepend(0); messageCountOverTime.prepend(0);
++messageCountOverTime[0]; ++messageCountOverTime[0];
for (int i = 0; i < messageCountOverTime.size(); ++i) for (int i = 0; i < messageCountOverTime.size(); ++i) {
totalCount += messageCountOverTime[i]; totalCount += messageCountOverTime[i];
}
if ((totalSize > server->getMaxMessageSizePerInterval()) || int maxMessageSizePerInterval = server->getMaxMessageSizePerInterval();
(totalCount > server->getMaxMessageCountPerInterval())) int maxMessageCountPerInterval = server->getMaxMessageCountPerInterval();
if ((maxMessageSizePerInterval > 0 && totalSize > maxMessageSizePerInterval) ||
(maxMessageCountPerInterval > 0 && totalCount > maxMessageCountPerInterval)) {
return Response::RespChatFlood; return Response::RespChatFlood;
}
} }
msg.replace(QChar('\n'), QChar(' ')); msg.replace(QChar('\n'), QChar(' '));

4
servatrice/src/servatrice.cpp
View file

@ -955,12 +955,12 @@ int Servatrice::getMaxGamesPerUser() const
int Servatrice::getCommandCountingInterval() const int Servatrice::getCommandCountingInterval() const
{ {
return settingsCache->value("game/command_counting_interval", 10).toInt(); return settingsCache->value("security/command_counting_interval", 10).toInt();
} }
int Servatrice::getMaxCommandCountPerInterval() const int Servatrice::getMaxCommandCountPerInterval() const
{ {
return settingsCache->value("game/max_command_count_per_interval", 20).toInt(); return settingsCache->value("security/max_command_count_per_interval", 20).toInt();
} }
int Servatrice::getServerStatusUpdateTime() const int Servatrice::getServerStatusUpdateTime() const