X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanfilter.cpp;h=646a1b284de34e6b886b2154a0d5b7b9e6240624;hb=267d85ac62018b12bc03b53a9c82ed39b4ca7f44;hp=fdc45a97ec9ba54e6033f0658c4831dfda383137;hpb=fd0fa86da89ab4cefa778307088ef2552a05a170;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index fdc45a97e..646a1b284 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-2020 Sadie Powell + * Copyright (C) 2012-2014 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 @@ -23,119 +23,152 @@ */ -#define _CRT_SECURE_NO_DEPRECATE -#define _SCL_SECURE_NO_DEPRECATE - #include "inspircd.h" #include "listmode.h" +#include "modules/exemption.h" + +enum +{ + // InspIRCd-specific. + RPL_ENDOFSPAMFILTER = 940, + RPL_SPAMFILTER = 941 +}; -/** Handles channel mode +g - */ class ChanFilter : public ListModeBase { public: - ChanFilter(Module* Creator) : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { } + unsigned long maxlen; + + ChanFilter(Module* Creator) + : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", RPL_SPAMFILTER, RPL_ENDOFSPAMFILTER, false) + { + syntax = ""; + } - bool ValidateParam(User* user, Channel* chan, std::string &word) + bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { - if ((word.length() > 35) || (word.empty())) + if (word.length() > maxlen) { - user->WriteNumeric(935, "%s %s %s :word is too %s for censor list",user->nick.c_str(), chan->name.c_str(), word.c_str(), (word.empty() ? "short" : "long")); + 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, "%s %s %s :Channel spamfilter list is full", user->nick.c_str(), chan->name.c_str(), word.c_str()); - } - - void TellAlreadyOnList(User* user, Channel* chan, std::string &word) - { - user->WriteNumeric(937, "%s %s :The word %s is already on the spamfilter list",user->nick.c_str(), chan->name.c_str(), word.c_str()); - } - - void TellNotSet(User* user, Channel* chan, std::string &word) - { - user->WriteNumeric(938, "%s %s :No such spamfilter word is set",user->nick.c_str(), chan->name.c_str()); - } }; class ModuleChanFilter : public Module { + CheckExemption::EventProvider exemptionprov; ChanFilter cf; bool hidemask; + bool notifyuser; - public: - - ModuleChanFilter() - : cf(this) + 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; - void init() CXX11_OVERRIDE - { - ServerInstance->Modules->AddService(cf); + ListModeBase::ModeList* list = cf.GetList(chan); + if (!list) + return NULL; - cf.DoImplements(this); - Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnSyncChannel }; - ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + for (ListModeBase::ModeList::iterator i = list->begin(); i != list->end(); i++) + { + if (InspIRCd::Match(text, i->mask)) + return &*i; + } + + return NULL; + } + + public: - OnRehash(NULL); + ModuleChanFilter() + : exemptionprov(this) + , cf(this) + { } - void OnRehash(User* user) CXX11_OVERRIDE + 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 ProcessMessages(User* user,Channel* chan,std::string &text) + void OnUserPart(Membership* memb, std::string& partmessage, CUList& except_list) CXX11_OVERRIDE { - ModResult res = ServerInstance->OnCheckExemption(user,chan,"filter"); + if (!memb) + return; - if (!IS_LOCAL(user) || res == MOD_RES_ALLOW) - return MOD_RES_PASSTHRU; + User* user = memb->user; + Channel* chan = memb->chan; + ChanFilter::ListItem* match = Match(user, chan, partmessage); + if (!match) + return; - ListModeBase::ModeList* list = cf.GetList(chan); + // Match() checks the user is local, we can assume from here + LocalUser* luser = IS_LOCAL(user); - if (list) + std::string oldreason(partmessage); + partmessage = "Reason filtered"; + if (!notifyuser) { - for (ListModeBase::ModeList::iterator i = list->begin(); i != list->end(); i++) - { - if (InspIRCd::Match(text, i->mask)) - { - if (hidemask) - user->WriteNumeric(404, "%s %s :Cannot send to channel (your message contained a censored word)",user->nick.c_str(), chan->name.c_str()); - else - user->WriteNumeric(404, "%s %s %s :Cannot send to channel (your message contained a censored word)",user->nick.c_str(), chan->name.c_str(), i->mask.c_str()); - return MOD_RES_DENY; - } - } + // 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; } - return MOD_RES_PASSTHRU; + if (hidemask) + user->WriteNumeric(Numerics::CannotSendTo(chan, "Your part message contained a banned phrase and was blocked.")); + else + user->WriteNumeric(Numerics::CannotSendTo(chan, InspIRCd::Format("Your part message contained a banned phrase (%s) and was blocked.", + match->mask.c_str()))); } - ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE { - if (target_type == TYPE_CHANNEL) + if (target.type != MessageTarget::TYPE_CHANNEL) + return MOD_RES_PASSTHRU; + + Channel* chan = target.Get(); + ChanFilter::ListItem* match = Match(user, chan, details.text); + if (match) { - return ProcessMessages(user,(Channel*)dest,text); + if (!notifyuser) + { + details.echo_original = true; + return MOD_RES_DENY; + } + + if (hidemask) + user->WriteNumeric(Numerics::CannotSendTo(chan, "Your message to this channel contained a banned phrase and was blocked.")); + else + user->WriteNumeric(Numerics::CannotSendTo(chan, InspIRCd::Format("Your message to this channel contained a banned phrase (%s) and was blocked.", + match->mask.c_str()))); + + return MOD_RES_DENY; } return MOD_RES_PASSTHRU; } - void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE - { - cf.DoSyncChannel(chan, proto, opaque); - } - 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("Adds channel mode g (filter) which allows channel operators to define glob patterns for inappropriate phrases that are not allowed to be used in the channel.", VF_VENDOR, maxfilterlen); } };