R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Discard invalid string commands

Browse Source 
Must be UTF-8 encoded, currently there are no checks.
This commit is contained in:
Kawe Mazidjatari 2023-06-22 23:45:19 +02:00
parent 89458eb23e
commit a93824b2db
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
r5dev/engine/client/client.cpp
View File

@ -390,6 +390,19 @@ bool CClient::VProcessStringCmd(CClient* pClient, NET_StringCmd* pMsg)
if (!nCmdQuotaLimit) if (!nCmdQuotaLimit)
return true; return true;
const char* pCmd = pMsg->cmd;
// Just skip if the cmd pointer is null, we still check if the
// client sent too many commands and take appropriate actions.
// The internal function discards the command if it's null.
if (pCmd && !IsValidUTF8(pCmd))
{
Warning(eDLL_T::SERVER, "Removing client '%s' from slot #%i ('%llu' sent invalid UTF-8 string command!)\n",
pClient_Adj->GetNetChan()->GetAddress(), pClient_Adj->GetUserID(), pClient_Adj->GetNucleusID());
pClient_Adj->Disconnect(Reputation_t::REP_MARK_BAD, "#DISCONNECT_INVALID_STRINGCMD");
return true;
}
if (flStartTime - pSlot->m_flStringCommandQuotaTimeStart >= 1.0) if (flStartTime - pSlot->m_flStringCommandQuotaTimeStart >= 1.0)
{ {
pSlot->m_flStringCommandQuotaTimeStart = flStartTime; pSlot->m_flStringCommandQuotaTimeStart = flStartTime;
@ -399,13 +412,10 @@ bool CClient::VProcessStringCmd(CClient* pClient, NET_StringCmd* pMsg)
if (pSlot->m_nStringCommandQuotaCount > nCmdQuotaLimit) if (pSlot->m_nStringCommandQuotaCount > nCmdQuotaLimit)
{ {
const char* pszAddress = pClient_Adj->GetNetChan()->GetAddress(); Warning(eDLL_T::SERVER, "Removing client '%s' from slot #%i ('%llu' exceeded string command quota!)\n",
const uint64_t nNucleusID = pClient_Adj->GetNucleusID(); pClient_Adj->GetNetChan()->GetAddress(), pClient_Adj->GetUserID(), pClient_Adj->GetNucleusID());
pClient_Adj->Disconnect(Reputation_t::REP_MARK_BAD, "#DISCONNECT_STRINGCMD_OVERFLOW"); pClient_Adj->Disconnect(Reputation_t::REP_MARK_BAD, "#DISCONNECT_STRINGCMD_OVERFLOW");
Warning(eDLL_T::SERVER, "Removed client '%s' from slot #%i ('%llu' exceeded string command quota!)\n",
pszAddress, nUserID, nNucleusID);
return true; return true;
} }
#endif // !CLIENT_DLL #endif // !CLIENT_DLL

2
r5dev/resource/playlist/playlists_r5_patch.txt
View File

@ -1199,6 +1199,8 @@ playlists
"DISCONNECT_SEND_OVERFLOW" "Connection to server overflowed (code:dam)." "DISCONNECT_SEND_OVERFLOW" "Connection to server overflowed (code:dam)."
"DISCONNECT_NETCHAN_OVERFLOW" "Connection to server overflowed (code:vulkan)." "DISCONNECT_NETCHAN_OVERFLOW" "Connection to server overflowed (code:vulkan)."
"DISCONNECT_STRINGCMD_OVERFLOW" "Connection to server overflowed (code:mountain)." "DISCONNECT_STRINGCMD_OVERFLOW" "Connection to server overflowed (code:mountain)."
"DISCONNECT_INVALID_STRINGCMD" "Invalid string command."
} }
} }
} }