X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanfilter.cpp;h=8d2408e7a0c205a0302db211eb7f24f88852418a;hb=8df3d792bc99d9dd73db7a601ebe8d4a397c3522;hp=90e266fc3d02fe876a5c99e40f37d27b361b6483;hpb=dcd3438011d59aa4de4df64abf06bca1cbf36859;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index 90e266fc3..8d2408e7a 100644 --- a/src/modules/m_chanfilter.cpp +++ b/src/modules/m_chanfilter.cpp @@ -1,13 +1,13 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2013, 2017-2019 Sadie Powell + * Copyright (C) 2012-2014, 2016 Attila Molnar + * Copyright (C) 2012, 2018 Robby * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2008 Pippijn van Steenhoven - * Copyright (C) 2007 Robin Burchell * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006 Oliver Lupton - * Copyright (C) 2005 Craig McLure - * Copyright (C) 2005 Craig Edwards + * Copyright (C) 2006, 2008-2010 Craig Edwards * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public @@ -32,33 +32,24 @@ class ChanFilter : public ListModeBase { public: - ChanFilter(Module* Creator) : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { } + unsigned long maxlen; - bool ValidateParam(User* user, Channel* chan, std::string &word) + ChanFilter(Module* Creator) + : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", 941, 940, false) { - if (word.length() > 35) + syntax = ""; + } + + bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE + { + if (word.length() > maxlen) { - user->WriteNumeric(935, chan->name, word, "%word is too long for censor list"); + user->WriteNumeric(Numerics::InvalidModeParameter(chan, this, word, "Word is too long for the spamfilter list.")); return false; } return true; } - - void TellListTooLong(User* user, Channel* chan, std::string &word) - { - user->WriteNumeric(939, chan->name, word, "Channel spamfilter list is full"); - } - - void TellAlreadyOnList(User* user, Channel* chan, std::string &word) - { - user->WriteNumeric(937, chan->name, InspIRCd::Format("The word %s is already on the spamfilter list", word.c_str())); - } - - void TellNotSet(User* user, Channel* chan, std::string &word) - { - user->WriteNumeric(938, chan->name, "No such spamfilter word is set"); - } }; class ModuleChanFilter : public Module @@ -66,6 +57,26 @@ class ModuleChanFilter : public Module CheckExemption::EventProvider exemptionprov; ChanFilter cf; bool hidemask; + bool notifyuser; + + ChanFilter::ListItem* Match(User* user, Channel* chan, const std::string& text) + { + ModResult res = CheckExemption::Call(exemptionprov, user, chan, "filter"); + if (!IS_LOCAL(user) || res == MOD_RES_ALLOW) + return NULL; + + ListModeBase::ModeList* list = cf.GetList(chan); + if (!list) + return NULL; + + for (ListModeBase::ModeList::iterator i = list->begin(); i != list->end(); i++) + { + if (InspIRCd::Match(text, i->mask)) + return &*i; + } + + return NULL; + } public: @@ -77,44 +88,80 @@ class ModuleChanFilter : public Module void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - hidemask = ServerInstance->Config->ConfValue("chanfilter")->getBool("hidemask"); + ConfigTag* tag = ServerInstance->Config->ConfValue("chanfilter"); + hidemask = tag->getBool("hidemask"); + cf.maxlen = tag->getUInt("maxlen", 35, 10, ModeParser::MODE_PARAM_MAX); + notifyuser = tag->getBool("notifyuser", true); cf.DoRehash(); } - ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE + void OnUserPart(Membership* memb, std::string& partmessage, CUList& except_list) CXX11_OVERRIDE { - if (target_type != TYPE_CHANNEL) - return MOD_RES_PASSTHRU; + if (!memb) + return; - Channel* chan = static_cast(dest); - ModResult res = CheckExemption::Call(exemptionprov, user, chan, "filter"); + User* user = memb->user; + Channel* chan = memb->chan; + ChanFilter::ListItem* match = Match(user, chan, partmessage); + if (!match) + return; - if (!IS_LOCAL(user) || res == MOD_RES_ALLOW) - return MOD_RES_PASSTHRU; + // Match() checks the user is local, we can assume from here + LocalUser* luser = IS_LOCAL(user); - ListModeBase::ModeList* list = cf.GetList(chan); + std::string oldreason(partmessage); + partmessage = "Reason filtered"; + if (!notifyuser) + { + // Send fake part + ClientProtocol::Messages::Part partmsg(memb, oldreason); + ClientProtocol::Event ev(ServerInstance->GetRFCEvents().part, partmsg); + luser->Send(ev); + + // Don't send the user the changed message + except_list.insert(user); + return; + } - if (list) + if (hidemask) + user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (your part message contained a censored word)"); + else + user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (your part message contained a censored word: " + match->mask + ")"); + } + + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + { + if (target.type != MessageTarget::TYPE_CHANNEL) + return MOD_RES_PASSTHRU; + + Channel* chan = target.Get(); + ChanFilter::ListItem* match = Match(user, chan, details.text); + if (match) { - for (ListModeBase::ModeList::iterator i = list->begin(); i != list->end(); i++) + if (!notifyuser) { - if (InspIRCd::Match(text, i->mask)) - { - if (hidemask) - user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (your message contained a censored word)"); - else - user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, i->mask, "Cannot send to channel (your message contained a censored word)"); - return MOD_RES_DENY; - } + details.echo_original = true; + return MOD_RES_DENY; } - } + if (hidemask) + user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (your message contained a censored word)"); + else + user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (your message contained a censored word: " + match->mask + ")"); + + return MOD_RES_DENY; + } return MOD_RES_PASSTHRU; } Version GetVersion() CXX11_OVERRIDE { - return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR); + // We don't send any link data if the length is 35 for compatibility with the 2.0 branch. + std::string maxfilterlen; + if (cf.maxlen != 35) + maxfilterlen.assign(ConvToStr(cf.maxlen)); + + return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR, maxfilterlen); } };