X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.cpp;h=786ea673bb27cce92881c678b42e01ba7cedda5b;hb=581d1d8fa0ef62e20409543570390613c78e6f5b;hp=136ea18c5c9abe013f2f0ae0da27ce1114008d43;hpb=aa692dc1039b63deef7886e914ec499abe7facaf;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 136ea18c5..786ea673b 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -7,7 +7,7 @@ * Copyright (C) 2018 Michael Hazell * Copyright (C) 2017 B00mX0r * Copyright (C) 2012-2014, 2016 Attila Molnar - * Copyright (C) 2012-2013, 2017-2019 Sadie Powell + * Copyright (C) 2012-2013, 2017-2020 Sadie Powell * Copyright (C) 2012, 2018-2019 Robby * Copyright (C) 2011 Adam * Copyright (C) 2009-2010 Daniel De Graaf @@ -385,7 +385,6 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar if (f) { bool is_selfmsg = false; - std::string target; switch (msgtarget.type) { case MessageTarget::TYPE_USER: @@ -397,8 +396,6 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar if (user == t) is_selfmsg = true; - - target = t->nick; break; } case MessageTarget::TYPE_CHANNEL: @@ -406,12 +403,10 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar Channel* t = msgtarget.Get(); if (exemptedchans.count(t->name)) return MOD_RES_PASSTHRU; - - target = t->name; break; } case MessageTarget::TYPE_SERVER: - break; + return MOD_RES_PASSTHRU; } if (is_selfmsg && warnonselfmsg) @@ -423,19 +418,19 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar else if (f->action == FA_WARN) { ServerInstance->SNO->WriteGlobalSno('f', InspIRCd::Format("WARNING: %s's message to %s matched %s (%s)", - user->nick.c_str(), target.c_str(), f->freeform.c_str(), f->reason.c_str())); + user->nick.c_str(), msgtarget.GetName().c_str(), f->freeform.c_str(), f->reason.c_str())); return MOD_RES_PASSTHRU; } else if (f->action == FA_BLOCK) { ServerInstance->SNO->WriteGlobalSno('f', InspIRCd::Format("%s had their message to %s filtered as it matched %s (%s)", - user->nick.c_str(), target.c_str(), f->freeform.c_str(), f->reason.c_str())); + user->nick.c_str(), msgtarget.GetName().c_str(), f->freeform.c_str(), f->reason.c_str())); if (notifyuser) { if (msgtarget.type == MessageTarget::TYPE_CHANNEL) - user->WriteNumeric(ERR_CANNOTSENDTOCHAN, target, InspIRCd::Format("Message to channel blocked and opers notified (%s)", f->reason.c_str())); + user->WriteNumeric(Numerics::CannotSendTo(msgtarget.Get(), InspIRCd::Format("Your message to this channel was blocked: %s.", f->reason.c_str()))); else - user->WriteNotice("Your message to "+target+" was blocked and opers notified: "+f->reason); + user->WriteNumeric(Numerics::CannotSendTo(msgtarget.Get(), InspIRCd::Format("Your message to this user was blocked: %s.", f->reason.c_str()))); } else details.echo_original = true; @@ -445,9 +440,9 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar if (notifyuser) { if (msgtarget.type == MessageTarget::TYPE_CHANNEL) - user->WriteNumeric(ERR_CANNOTSENDTOCHAN, target, InspIRCd::Format("Message to channel blocked (%s)", f->reason.c_str())); + user->WriteNumeric(Numerics::CannotSendTo(msgtarget.Get(), InspIRCd::Format("Your message to this channel was blocked: %s.", f->reason.c_str()))); else - user->WriteNotice("Your message to "+target+" was blocked: "+f->reason); + user->WriteNumeric(Numerics::CannotSendTo(msgtarget.Get(), InspIRCd::Format("Your message to this user was blocked: %s.", f->reason.c_str()))); } else details.echo_original = true; @@ -455,7 +450,7 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar else if (f->action == FA_KILL) { ServerInstance->SNO->WriteGlobalSno('f', InspIRCd::Format("%s was killed because their message to %s matched %s (%s)", - user->nick.c_str(), target.c_str(), f->freeform.c_str(), f->reason.c_str())); + user->nick.c_str(), msgtarget.GetName().c_str(), f->freeform.c_str(), f->reason.c_str())); ServerInstance->Users->QuitUser(user, "Filtered: " + f->reason); } else if (f->action == FA_SHUN && (ServerInstance->XLines->GetFactory("SHUN"))) @@ -464,7 +459,7 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar ServerInstance->SNO->WriteGlobalSno('f', InspIRCd::Format("%s (%s) was shunned for %s (expires on %s) because their message to %s matched %s (%s)", user->nick.c_str(), sh->Displayable().c_str(), InspIRCd::DurationString(f->duration).c_str(), InspIRCd::TimeString(ServerInstance->Time() + f->duration).c_str(), - target.c_str(), f->freeform.c_str(), f->reason.c_str())); + msgtarget.GetName().c_str(), f->freeform.c_str(), f->reason.c_str())); if (ServerInstance->XLines->AddLine(sh, NULL)) { ServerInstance->XLines->ApplyLines(); @@ -478,7 +473,7 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar ServerInstance->SNO->WriteGlobalSno('f', InspIRCd::Format("%s (%s) was G-lined for %s (expires on %s) because their message to %s matched %s (%s)", user->nick.c_str(), gl->Displayable().c_str(), InspIRCd::DurationString(f->duration).c_str(), InspIRCd::TimeString(ServerInstance->Time() + f->duration).c_str(), - target.c_str(), f->freeform.c_str(), f->reason.c_str())); + msgtarget.GetName().c_str(), f->freeform.c_str(), f->reason.c_str())); if (ServerInstance->XLines->AddLine(gl,NULL)) { ServerInstance->XLines->ApplyLines(); @@ -492,7 +487,7 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar ServerInstance->SNO->WriteGlobalSno('f', InspIRCd::Format("%s (%s) was Z-lined for %s (expires on %s) because their message to %s matched %s (%s)", user->nick.c_str(), zl->Displayable().c_str(), InspIRCd::DurationString(f->duration).c_str(), InspIRCd::TimeString(ServerInstance->Time() + f->duration).c_str(), - target.c_str(), f->freeform.c_str(), f->reason.c_str())); + msgtarget.GetName().c_str(), f->freeform.c_str(), f->reason.c_str())); if (ServerInstance->XLines->AddLine(zl,NULL)) { ServerInstance->XLines->ApplyLines(); @@ -501,7 +496,7 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar delete zl; } - ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, user->nick + " had their message filtered, target was " + target + ": " + f->reason + " Action: " + ModuleFilter::FilterActionToString(f->action)); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, user->nick + " had their message filtered, target was " + msgtarget.GetName() + ": " + f->reason + " Action: " + ModuleFilter::FilterActionToString(f->action)); return MOD_RES_DENY; } return MOD_RES_PASSTHRU; @@ -547,7 +542,7 @@ ModResult ModuleFilter::OnPreCommand(std::string& command, CommandBase::Params& /* We cant block a part or quit, so instead we change the reason to 'Reason filtered' */ parameters[parting ? 1 : 0] = "Reason filtered"; - /* We're warning or blocking, OR theyre quitting and its a KILL action + /* We're warning or blocking, OR they're quitting and its a KILL action * (we cant kill someone whos already quitting, so filter them anyway) */ if ((f->action == FA_WARN) || (f->action == FA_BLOCK) || (((!parting) && (f->action == FA_KILL))) || (f->action == FA_SILENT)) @@ -629,7 +624,7 @@ void ModuleFilter::ReadConfig(ConfigStatus& status) ConfigTag* tag = i->second; // If "target" is not found, try the old "channel" key to keep compatibility with 2.0 configs - const std::string target = tag->getString("target", tag->getString("channel")); + const std::string target = tag->getString("target", tag->getString("channel"), 1); if (!target.empty()) { if (target[0] == '#') @@ -675,7 +670,7 @@ void ModuleFilter::ReadConfig(ConfigStatus& status) Version ModuleFilter::GetVersion() { - return Version("Provides text (spam) filtering", VF_VENDOR | VF_COMMON, RegexEngine ? RegexEngine->name : ""); + return Version("Adds the /FILTER command which allows server operators to define regex matches for inappropriate phrases that are not allowed to be used in channel messages, private messages, part messages, or quit messages.", VF_VENDOR | VF_COMMON, RegexEngine ? RegexEngine->name : ""); } std::string ModuleFilter::EncodeFilter(FilterResult* filter) @@ -904,7 +899,7 @@ ModResult ModuleFilter::OnStats(Stats::Context& stats) { for (std::vector::iterator i = filters.begin(); i != filters.end(); i++) { - stats.AddRow(223, RegexEngine.GetProvider()+":"+i->freeform+" "+i->GetFlags()+" "+FilterActionToString(i->action)+" "+ConvToStr(i->duration)+" :"+i->reason); + stats.AddRow(223, RegexEngine.GetProvider(), i->freeform, i->GetFlags(), FilterActionToString(i->action), i->duration, i->reason); } for (ExemptTargetSet::const_iterator i = exemptedchans.begin(); i != exemptedchans.end(); ++i) {