X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=bd63809ed5bfab1d282bc196708b6d5c619acbac;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=5e832cc8b6007e12c6197d91ebd97c45caefe355;hpb=a66b5a7b8f10a876970230cd087352d3bda5ef3e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index 5e832cc8b..bd63809ed 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -1,10 +1,15 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2004, 2008-2009 Craig Edwards + * 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 Dennis Friis - * Copyright (C) 2005, 2007 Robin Burchell + * Copyright (C) 2005, 2007-2008 Robin Burchell + * Copyright (C) 2004, 2006, 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 @@ -20,123 +25,104 @@ */ -/* $ModDesc: Provides user and channel +G mode */ - -#define _CRT_SECURE_NO_DEPRECATE -#define _SCL_SECURE_NO_DEPRECATE - #include "inspircd.h" -#include +#include "modules/exemption.h" -typedef std::map censor_t; - -/** Handles usermode +G - */ -class CensorUser : public SimpleUserModeHandler -{ - public: - CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, "u_censor", 'G') { } -}; - -/** Handles channel mode +G - */ -class CensorChannel : public SimpleChannelModeHandler -{ - public: - CensorChannel(Module* Creator) : SimpleChannelModeHandler(Creator, "censor", 'G') { } -}; +typedef insp::flat_map censor_t; class ModuleCensor : public Module { + CheckExemption::EventProvider exemptionprov; censor_t censors; - CensorUser cu; - CensorChannel cc; + SimpleUserModeHandler cu; + SimpleChannelModeHandler cc; public: - ModuleCensor() : cu(this), cc(this) { } - - void init() - { - /* Read the configuration file on startup. - */ - OnRehash(NULL); - ServerInstance->Modules->AddService(cu); - ServerInstance->Modules->AddService(cc); - Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice }; - ServerInstance->Modules->Attach(eventlist, this, 3); - } - - - virtual ~ModuleCensor() + ModuleCensor() + : exemptionprov(this) + , cu(this, "u_censor", 'G') + , cc(this, "censor", 'G') { } // format of a config entry is - virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE { if (!IS_LOCAL(user)) return MOD_RES_PASSTHRU; - bool active = false; - - if (target_type == TYPE_USER) - active = ((User*)dest)->IsModeSet('G'); - else if (target_type == TYPE_CHANNEL) + switch (target.type) { - active = ((Channel*)dest)->IsModeSet('G'); - Channel* c = (Channel*)dest; - ModResult res = ServerInstance->OnCheckExemption(user,c,"censor"); + case MessageTarget::TYPE_USER: + { + User* targuser = target.Get(); + if (!targuser->IsModeSet(cu)) + return MOD_RES_PASSTHRU; + break; + } - if (res == MOD_RES_ALLOW) + case MessageTarget::TYPE_CHANNEL: + { + Channel* targchan = target.Get(); + if (!targchan->IsModeSet(cc)) + return MOD_RES_PASSTHRU; + + ModResult result = CheckExemption::Call(exemptionprov, user, targchan, "censor"); + if (result == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; + break; + } + + default: return MOD_RES_PASSTHRU; } - if (!active) - 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->WriteNumeric(ERR_WORDFILTERED, "%s %s %s :Your message contained a censored word, and was blocked", user->nick.c_str(), ((Channel*)dest)->name.c_str(), index->first.c_str()); + const std::string msg = InspIRCd::Format("Your message to this channel contained a banned phrase (%s) and was blocked.", index->first.c_str()); + if (target.type == MessageTarget::TYPE_CHANNEL) + user->WriteNumeric(Numerics::CannotSendTo(target.Get(), msg)); + else + user->WriteNumeric(Numerics::CannotSendTo(target.Get(), msg)); return MOD_RES_DENY; } - SearchAndReplace(text2, index->first, index->second); + details.text.replace(censorpos, index->first.size(), index->second); } } - text = text2.c_str(); return MOD_RES_PASSTHRU; } - virtual ModResult 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 OnRehash(User* user) + 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; - censors.clear(); + censor_t newcensors; - for (int index = 0; index < MyConf.Enumerate("badword"); index++) + 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; } + censors.swap(newcensors); } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("Provides user and channel +G mode",VF_VENDOR); + return Version("Allows the server administrator to define inappropriate phrases that are not allowed to be used in private or channel messages.", VF_VENDOR); } };