X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanfilter.cpp;h=ff3e4ca967b0b9b787f2315cf93f126c0b5ae92d;hb=a5b9f37d62670a49e81c5a53f93bdf485aace4a6;hp=53a0ff0334ba5a9232d5888d3d5e3cd87419694b;hpb=6fa2633311098d9775593186f5f5e1d339434cd2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index 53a0ff033..5591c7ef9 100644 --- a/src/modules/m_chanfilter.cpp +++ b/src/modules/m_chanfilter.cpp @@ -1,148 +1,139 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * 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 * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#define _CRT_SECURE_NO_DEPRECATE -#define _SCL_SECURE_NO_DEPRECATE #include "inspircd.h" -#include "u_listmode.h" +#include "listmode.h" +#include "modules/exemption.h" -/* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */ -/* $ModDep: ../../include/u_listmode.h */ +enum +{ + // InspIRCd-specific. + ERR_ALREADYCHANFILTERED = 937, + ERR_NOSUCHCHANFILTER = 938 +}; /** Handles channel mode +g */ class ChanFilter : public ListModeBase { public: - ChanFilter(InspIRCd* Instance) : ListModeBase(Instance, 'g', "End of channel spamfilter list", "941", "940", false, "chanfilter") { } - - virtual bool ValidateParam(User* user, Channel* chan, std::string &word) + unsigned long maxlen; + + ChanFilter(Module* Creator) : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { } + + bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { - if ((word.length() > 35) || (word.empty())) + if (word.length() > maxlen) { - user->WriteServ("935 %s %s %s :word is too %s for censor list",user->nick, chan->name,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; - } - - virtual bool TellListTooLong(User* user, Channel* chan, std::string &word) - { - user->WriteServ("939 %s %s %s :Channel spamfilter list is full",user->nick, chan->name, word.c_str()); + return true; } - - virtual void TellAlreadyOnList(User* user, Channel* chan, std::string &word) + + void TellAlreadyOnList(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { - user->WriteServ("937 %s %s :The word %s is already on the spamfilter list",user->nick, chan->name,word.c_str()); + user->WriteNumeric(ERR_ALREADYCHANFILTERED, chan->name, InspIRCd::Format("The word %s is already on the spamfilter list", word.c_str())); } - - virtual void TellNotSet(User* user, Channel* chan, std::string &word) + + void TellNotSet(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { - user->WriteServ("938 %s %s :No such spamfilter word is set",user->nick, chan->name); + user->WriteNumeric(ERR_NOSUCHCHANFILTER, chan->name, "No such spamfilter word is set"); } }; class ModuleChanFilter : public Module { - - ChanFilter* cf; - - public: - - ModuleChanFilter(InspIRCd* Me) - : Module(Me) - { - cf = new ChanFilter(ServerInstance); - if (!ServerInstance->AddMode(cf)) - throw ModuleException("Could not add new modes!"); + CheckExemption::EventProvider exemptionprov; + ChanFilter cf; + bool hidemask; + bool notifyuser; - cf->DoImplements(this); - Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel }; - ServerInstance->Modules->Attach(eventlist, this, 6); - } + public: - virtual void OnChannelDelete(Channel* chan) + ModuleChanFilter() + : exemptionprov(this) + , cf(this) { - cf->DoChannelDelete(chan); } - virtual void OnRehash(User* user, const std::string ¶meter) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - cf->DoRehash(); + ConfigTag* tag = ServerInstance->Config->ConfValue("chanfilter"); + hidemask = tag->getBool("hidemask"); + cf.maxlen = tag->getUInt("maxlen", 35, 10, 100); + notifyuser = tag->getBool("notifyuser", true); + cf.DoRehash(); } - virtual int ProcessMessages(User* user,Channel* chan,std::string &text) + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE { - if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP) - return 0; + if (target.type != MessageTarget::TYPE_CHANNEL) + return MOD_RES_PASSTHRU; - // Create a copy of the string in irc::string - irc::string line = text.c_str(); + Channel* chan = target.Get(); + ModResult res = CheckExemption::Call(exemptionprov, user, chan, "filter"); - modelist* list; - chan->GetExt(cf->GetInfoKey(), list); + if (!IS_LOCAL(user) || res == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; + + ListModeBase::ModeList* list = cf.GetList(chan); if (list) { - for (modelist::iterator i = list->begin(); i != list->end(); i++) + for (ListModeBase::ModeList::iterator i = list->begin(); i != list->end(); i++) { - if (line.find(i->mask.c_str()) != std::string::npos) + if (InspIRCd::Match(details.text, i->mask)) { - user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked",user->nick, chan->name, i->mask.c_str()); - return 1; + if (!notifyuser) + { + 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: " + i->mask + ")"); + return MOD_RES_DENY; } } } - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) - { - if (target_type == TYPE_CHANNEL) - { - return ProcessMessages(user,(Channel*)dest,text); - } - else return 0; - } - - virtual void OnCleanup(int target_type, void* item) - { - cf->DoCleanup(target_type, item); - } - - virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) - { - return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); - } - - virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque) + Version GetVersion() CXX11_OVERRIDE { - cf->DoSyncChannel(chan, proto, opaque); - } + // 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)); - virtual Version GetVersion() - { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); - } - - virtual ~ModuleChanFilter() - { - ServerInstance->Modes->DelMode(cf); - delete cf; + return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR, maxfilterlen); } };