X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=0e1fa945ffecfdd5ef391d71b6a431d592fc1692;hb=b36ce84c7da93f680fc397bcb4c877abe063eaaa;hp=21e08470f7518694756d0e9a99b128de4ffc5927;hpb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp index 21e08470f..0e1fa945f 100644 --- a/src/modules/m_blockcaps.cpp +++ b/src/modules/m_blockcaps.cpp @@ -1,138 +1,134 @@ -/* +------------------------------------+ - * | 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) 2006, 2008 Craig Edwards + * Copyright (C) 2006-2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2006 Oliver Lupton * - * 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 . */ + #include "inspircd.h" -/* $ModDesc: Provides support for channel mode +P to block all-CAPS channel messages and notices */ +/* $ModDesc: Provides support to block all-CAPS channel messages and notices */ -/** Handles the +P channel mode +/** Handles the +B channel mode */ -class BlockCaps : public ModeHandler +class BlockCaps : public SimpleChannelModeHandler { public: - BlockCaps(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { } - - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) - { - if (adding) - { - if (!channel->IsModeSet('P')) - { - channel->SetMode('P',true); - return MODEACTION_ALLOW; - } - } - else - { - if (channel->IsModeSet('P')) - { - channel->SetMode('P',false); - return MODEACTION_ALLOW; - } - } - - return MODEACTION_DENY; - } + BlockCaps(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcaps", 'B') { } }; class ModuleBlockCAPS : public Module { - BlockCaps* bc; + BlockCaps bc; int percent; unsigned int minlen; char capsmap[256]; + public: - - ModuleBlockCAPS(InspIRCd* Me) : Module(Me) + ModuleBlockCAPS() : bc(this) { - OnRehash(NULL,""); - bc = new BlockCaps(ServerInstance); - if (!ServerInstance->AddMode(bc, 'P')) - throw ModuleException("Could not add new modes!"); } - void Implements(char* List) + void init() CXX11_OVERRIDE { - List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1; + OnRehash(NULL); + ServerInstance->Modules->AddService(bc); + Implementation eventlist[] = { I_OnUserPreMessage, I_OnRehash, I_On005Numeric }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - virtual void OnRehash(userrec* user, const std::string ¶m) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE + { + tokens["EXTBAN"].push_back('B'); + } + + void OnRehash(User* user) CXX11_OVERRIDE { ReadConf(); } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE { if (target_type == TYPE_CHANNEL) { if ((!IS_LOCAL(user)) || (text.length() < minlen)) - return 0; + return MOD_RES_PASSTHRU; + + Channel* c = (Channel*)dest; + ModResult res = ServerInstance->OnCheckExemption(user,c,"blockcaps"); - chanrec* c = (chanrec*)dest; + if (res == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; - if (c->IsModeSet('P')) + if (!c->GetExtBanStatus(user, 'B').check(!c->IsModeSet('B'))) { int caps = 0; + const char* actstr = "\1ACTION "; + int act = 0; + for (std::string::iterator i = text.begin(); i != text.end(); i++) + { + /* Smart fix for suggestion from Jobe, ignore CTCP ACTION (part of /ME) */ + if (*actstr && *i == *actstr++ && act != -1) + { + act++; + continue; + } + else + act = -1; + caps += capsmap[(unsigned char)*i]; + } if ( ((caps*100)/(int)text.length()) >= percent ) { - user->WriteServ( "404 %s %s :Your line cannot be more than %d%% capital letters if it is %d or more letters long", user->nick, c->name, percent, minlen); - return 1; + user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Your message cannot contain more than %d%% capital letters if it's longer than %d characters", user->nick.c_str(), c->name.c_str(), percent, minlen); + return MOD_RES_DENY; } } } - 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; } void ReadConf() { - ConfigReader Conf(ServerInstance); - percent = Conf.ReadInteger("blockcaps", "percent", "100", 0, true); - minlen = Conf.ReadInteger("blockcaps", "minlen", "0", 0, true); - std::string hmap = Conf.ReadValue("blockcaps", "capsmap", 0); - if (hmap.empty()) - hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - memset(&capsmap, 0, 255); + ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps"); + percent = tag->getInt("percent", 100); + minlen = tag->getInt("minlen", 1); + std::string hmap = tag->getString("capsmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + memset(capsmap, 0, sizeof(capsmap)); for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++) capsmap[(unsigned char)*n] = 1; - if (percent < 0 || percent > 100) + if (percent < 1 || percent > 100) { - ServerInstance->Log(DEFAULT, " out of range, setting to default of 100."); + ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, " out of range, setting to default of 100."); percent = 100; } - if (minlen < 0 || minlen > MAXBUF-1) + if (minlen < 1 || minlen > MAXBUF-1) { - ServerInstance->Log(DEFAULT, " out of range, setting to default of 0."); - minlen = 0; + ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, " out of range, setting to default of 1."); + minlen = 1; } } - virtual ~ModuleBlockCAPS() - { - ServerInstance->Modes->DelMode(bc); - DELETE(bc); - } - - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); + return Version("Provides support to block all-CAPS channel messages and notices", VF_VENDOR); } };