X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=46e4daa48770baa9d0033c168f11c46e755e7c0d;hb=8f62016f16cf2419817738904153cb3711b20d7e;hp=fc2c55a96a0e307b9614e0e7e007ea9f142b5f36;hpb=76d7e8a0684b38a82e6c05ebd7538b69660e1bef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index fc2c55a96..d216bd11f 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -1,217 +1,131 @@ -/* +------------------------------------+ - * | 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) 2018 linuxdaemon + * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell + * Copyright (C) 2012-2013 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006, 2010 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. * - * --------------------------------------------------- - */ - -#include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" - -typedef std::map censor_t; - -/* $ModDesc: Provides user and channel +G mode */ - -/** Handles usermode +G + * 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 . */ -class CensorUser : public ModeHandler -{ - public: - CensorUser(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_USER, false) { } - - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) - { - if (adding) - { - if (!dest->IsModeSet('G')) - { - dest->SetMode('G',true); - return MODEACTION_ALLOW; - } - } - else - { - if (dest->IsModeSet('G')) - { - dest->SetMode('G',false); - return MODEACTION_ALLOW; - } - } - return MODEACTION_DENY; - } -}; - -/** Handles channel mode +G - */ -class CensorChannel : public ModeHandler -{ - public: - CensorChannel(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_CHANNEL, false) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) - { - if (adding) - { - if (!channel->IsModeSet('G')) - { - channel->SetMode('G',true); - return MODEACTION_ALLOW; - } - } - else - { - if (channel->IsModeSet('G')) - { - channel->SetMode('G',false); - return MODEACTION_ALLOW; - } - } +#include "inspircd.h" +#include "modules/exemption.h" - return MODEACTION_ALLOW; - } -}; +typedef insp::flat_map censor_t; class ModuleCensor : public Module { - - + CheckExemption::EventProvider exemptionprov; censor_t censors; - CensorUser *cu; - CensorChannel *cc; - - public: - ModuleCensor(InspIRCd* Me) - : Module(Me) - { - /* Read the configuration file on startup. - */ - OnRehash(NULL,""); - cu = new CensorUser(ServerInstance); - cc = new CensorChannel(ServerInstance); - if (!ServerInstance->AddMode(cu, 'G') || !ServerInstance->AddMode(cc, 'G')) - throw ModuleException("Could not add new modes!"); - } + SimpleUserModeHandler cu; + SimpleChannelModeHandler cc; - void Implements(char* List) + public: + ModuleCensor() + : exemptionprov(this) + , cu(this, "u_censor", 'G') + , cc(this, "censor", 'G') { - List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1; } - virtual ~ModuleCensor() + // format of a config entry is + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE { - ServerInstance->Modes->DelMode(cu); - ServerInstance->Modes->DelMode(cc); - DELETE(cu); - DELETE(cc); - } + if (!IS_LOCAL(user)) + return MOD_RES_PASSTHRU; - virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace) - { - if ((!pattern.empty()) && (!text.empty())) + int numeric = 0; + switch (target.type) { - std::string::size_type pos; - while ((pos = text.find(pattern)) != irc::string::npos) + case MessageTarget::TYPE_USER: { - text.erase(pos,pattern.length()); - text.insert(pos,replace); + User* targuser = target.Get(); + if (!targuser->IsModeSet(cu)) + return MOD_RES_PASSTHRU; + + numeric = ERR_CANTSENDTOUSER; + break; } - } - } - // format of a config entry is - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) - { - if (!IS_LOCAL(user)) - return 0; + case MessageTarget::TYPE_CHANNEL: + { + Channel* targchan = target.Get(); + if (!targchan->IsModeSet(cc)) + return MOD_RES_PASSTHRU; - bool active = false; + ModResult result = CheckExemption::Call(exemptionprov, user, targchan, "censor"); + if (result == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; - if (target_type == TYPE_USER) - active = ((userrec*)dest)->IsModeSet('G'); - else if (target_type == TYPE_CHANNEL) - active = ((chanrec*)dest)->IsModeSet('G'); + numeric = ERR_CANNOTSENDTOCHAN; + break; + } - if (!active) - return 0; + default: + return MOD_RES_PASSTHRU; + } - irc::string text2 = text.c_str(); for (censor_t::iterator index = censors.begin(); index != censors.end(); index++) - { - if (text2.find(index->first) != irc::string::npos) + { + size_t censorpos; + while ((censorpos = irc::find(details.text, index->first)) != std::string::npos) { if (index->second.empty()) { - user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked", user->nick, ((chanrec*)dest)->name, index->first.c_str()); - return 1; + user->WriteNumeric(numeric, target.GetName(), "Your message contained a censored word (" + index->first + "), and was blocked"); + return MOD_RES_DENY; } - - this->ReplaceLine(text2,index->first,index->second); + + details.text.replace(censorpos, index->first.size(), index->second); } } - text = text2.c_str(); - return 0; - } - - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) - { - return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); + return MOD_RES_PASSTHRU; } - - virtual void OnRehash(userrec* user, const std::string ¶meter) + + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { /* * reload our config file on rehash - we must destroy and re-allocate the classes * to call the constructor again and re-read our data. */ - ConfigReader* MyConf = new ConfigReader(ServerInstance); - censors.clear(); - for (int index = 0; index < MyConf->Enumerate("badword"); index++) + censor_t newcensors; + + ConfigTagList badwords = ServerInstance->Config->ConfTags("badword"); + for (ConfigIter i = badwords.first; i != badwords.second; ++i) { - irc::string pattern = (MyConf->ReadValue("badword","text",index)).c_str(); - irc::string replace = (MyConf->ReadValue("badword","replace",index)).c_str(); - censors[pattern] = replace; + ConfigTag* tag = i->second; + const std::string text = tag->getString("text"); + if (text.empty()) + throw ModuleException(" is empty! at " + tag->getTagLocation()); + + const std::string replace = tag->getString("replace"); + newcensors[text] = replace; } - DELETE(MyConf); - } - - virtual Version GetVersion() - { - return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); + censors.swap(newcensors); } - -}; - -// stuff down here is the module-factory stuff. For basic modules you can ignore this. -class ModuleCensorFactory : public ModuleFactory -{ - public: - ModuleCensorFactory() + Version GetVersion() CXX11_OVERRIDE { + return Version("Provides user and channel mode +G", VF_VENDOR); } - - ~ModuleCensorFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleCensor(Me); - } - -}; +}; -extern "C" DllExport void * init_module( void ) -{ - return new ModuleCensorFactory; -} +MODULE_INIT(ModuleCensor)