Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Chat: Some more chat filtering cleanup:

Browse Source 
* Always filter control characters
* Clean up stripping of duplicate whitespace
* Adjust .conf.dist to accurately describe what the config settings do

(cherry picked from commit e50344b6df)
This commit is contained in:
Treeston
2018-09-18 02:08:33 +02:00
committed by Shauren
parent 5fe69351b0
commit 0d7d41ed4f
2 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/server/game/Handlers/ChatHandler.cpp
View File

@@ -41,36 +41,40 @@
#include "Util.h"
#include "World.h"
#include "WorldPacket.h"
#include <algorithm>
static void StripInvisibleChars(std::string& str)
inline bool isNasty(char c)
{
static std::string const invChars = " \t\7\n";
if (c < 32) // all of these are control characters
return true;
if (c == 127) // ascii delete
return true;
if (uint8(c) == 255) // non-breaking whitespace
return true;
return false;
}
size_t wpos = 0;
bool space = false;
for (size_t pos = 0; pos < str.size(); ++pos)
inline bool ValidateMessage(Player const* player, std::string& msg)
{
// abort on any sort of nasty character
for (char c : msg)
{
if (invChars.find(str[pos]) != std::string::npos)
if (isNasty(c))
{
if (!space)
{
str[wpos++] = ' ';
space = true;
}
}
else
{
if (wpos != pos)
str[wpos++] = str[pos];
else
++wpos;
space = false;
TC_LOG_ERROR("network", "Player %s (%s) sent a message containing control character %u - blocked", player->GetName().c_str(),
player->GetGUID().ToString().c_str(), uint32(c));
return false;
}
}
if (wpos < str.size())
str.erase(wpos, str.size());
// collapse multiple spaces into one
if (sWorld->getBoolConfig(CONFIG_CHAT_FAKE_MESSAGE_PREVENTING))
{
auto end = std::unique(msg.begin(), msg.end(), [](char c1, char c2) { return (c1 == ' ') && (c2 == ' '); });
msg.erase(end, msg.end());
}
return true;
}
void WorldSession::HandleChatMessageOpcode(WorldPackets::Chat::ChatMessage& chatMessage)
@@ -208,9 +212,6 @@ void WorldSession::HandleChatMessage(ChatMsg type, Language lang, std::string ms
if (msg.size() > 255)
return;
// Strip invisible characters for non-addon messages
if (sWorld->getBoolConfig(CONFIG_CHAT_FAKE_MESSAGE_PREVENTING))
StripInvisibleChars(msg);
if (msg.empty())
return;
@@ -218,6 +219,11 @@ void WorldSession::HandleChatMessage(ChatMsg type, Language lang, std::string ms
if (ChatHandler(this).ParseCommands(msg.c_str()))
return;
// do message validity checks
if (!ValidateMessage(GetPlayer(), msg))
return;
// validate hyperlinks
if (!ValidateHyperlinksAndMaybeKick(msg))
return;
@@ -537,9 +543,9 @@ void WorldSession::HandleChatMessageAFKOpcode(WorldPackets::Chat::ChatMessageAFK
if (chatMessageAFK.Text.length() > 255)
return;
// Strip invisible characters for non-addon messages
if (sWorld->getBoolConfig(CONFIG_CHAT_FAKE_MESSAGE_PREVENTING))
StripInvisibleChars(chatMessageAFK.Text);
// do message validity checks
if (!ValidateMessage(sender, chatMessageAFK.Text))
return;
if (!ValidateHyperlinksAndMaybeKick(chatMessageAFK.Text))
return;
@@ -583,9 +589,9 @@ void WorldSession::HandleChatMessageDNDOpcode(WorldPackets::Chat::ChatMessageDND
if (chatMessageDND.Text.length() > 255)
return;
// Strip invisible characters for non-addon messages
if (sWorld->getBoolConfig(CONFIG_CHAT_FAKE_MESSAGE_PREVENTING))
StripInvisibleChars(chatMessageDND.Text);
// do message validity checks
if (!ValidateMessage(sender, chatMessageDND.Text))
return;
if (!ValidateHyperlinksAndMaybeKick(chatMessageDND.Text))
return;