X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=f3045cf52d51fdd0c38c5f829528a2e3e6f55252;hb=44e89aafb69fb266bdf780d12a31947bfff4e330;hp=ed40fca5b5b1f372ffb0e8ee8e1385df542eaceb;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index ed40fca5b..f3045cf52 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -1,26 +1,36 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2007 John Brooks + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Craig Edwards + * 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 channel mode +f (message flood protection) */ /** Holds flood settings and state for mode +f */ -class floodsettings : public classbase +class floodsettings { - private: - InspIRCd *ServerInstance; public: bool ban; int secs; @@ -28,7 +38,7 @@ class floodsettings : public classbase time_t reset; std::map counters; - floodsettings(InspIRCd *Instance, bool a, int b, int c) : ServerInstance(Instance), ban(a), secs(b), lines(c) + floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c) { reset = ServerInstance->Time() + secs; }; @@ -76,26 +86,13 @@ class floodsettings : public classbase class MsgFlood : public ModeHandler { public: - MsgFlood(InspIRCd* Instance) : ModeHandler(Instance, 'f', 1, 0, false, MODETYPE_CHANNEL, false) { } + SimpleExtItem ext; + MsgFlood(Module* Creator) : ModeHandler(Creator, "flood", 'f', PARAM_SETONLY, MODETYPE_CHANNEL), + ext("messageflood", Creator) { } - ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - floodsettings* x; - if (channel->GetExt("flood",x)) - return std::make_pair(true, (x->ban ? "*" : "")+ConvToStr(x->lines)+":"+ConvToStr(x->secs)); - else - return std::make_pair(false, parameter); - } - - bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel) - { - /* When TS is equal, the alphabetically later one wins */ - return (their_param < our_param); - } - - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) - { - floodsettings *f; + floodsettings *f = ext.get(channel); if (adding) { @@ -138,13 +135,12 @@ class MsgFlood : public ModeHandler } else { - if (!channel->GetExt("flood", f)) + if (!f) { parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs); - floodsettings *fs = new floodsettings(ServerInstance,ban,nsecs,nlines); - channel->Extend("flood",fs); - channel->SetMode('f', true); - channel->SetModeParam('f', parameter.c_str(), true); + f = new floodsettings(ban,nsecs,nlines); + ext.set(channel, f); + channel->SetModeParam('f', parameter); return MODEACTION_ALLOW; } else @@ -160,12 +156,9 @@ class MsgFlood : public ModeHandler { if ((((nlines != f->lines) || (nsecs != f->secs) || (ban != f->ban))) && (((nsecs > 0) && (nlines > 0)))) { - delete f; - floodsettings *fs = new floodsettings(ServerInstance,ban,nsecs,nlines); - channel->Shrink("flood"); - channel->Extend("flood",fs); - channel->SetModeParam('f', cur_param.c_str(), false); - channel->SetModeParam('f', parameter.c_str(), true); + floodsettings *fs = new floodsettings(ban,nsecs,nlines); + ext.set(channel, fs); + channel->SetModeParam('f', parameter); return MODEACTION_ALLOW; } else @@ -185,11 +178,10 @@ class MsgFlood : public ModeHandler } else { - if (channel->GetExt("flood", f)) + if (f) { - delete f; - channel->Shrink("flood"); - channel->SetMode('f', false); + ext.unset(channel); + channel->SetModeParam('f', ""); return MODEACTION_ALLOW; } } @@ -200,31 +192,28 @@ class MsgFlood : public ModeHandler class ModuleMsgFlood : public Module { - - MsgFlood* mf; + MsgFlood mf; public: - ModuleMsgFlood(InspIRCd* Me) - : Module(Me) + ModuleMsgFlood() + : mf(this) { - - mf = new MsgFlood(ServerInstance); - if (!ServerInstance->Modes->AddMode(mf)) + if (!ServerInstance->Modes->AddMode(&mf)) throw ModuleException("Could not add new modes!"); - Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreNotice, I_OnUserPreMessage }; - ServerInstance->Modules->Attach(eventlist, this, 3); + ServerInstance->Extensions.Register(&mf.ext); + Implementation eventlist[] = { I_OnUserPreNotice, I_OnUserPreMessage }; + ServerInstance->Modules->Attach(eventlist, this, 2); } - int ProcessMessages(User* user,Channel* dest, const std::string &text) + ModResult ProcessMessages(User* user,Channel* dest, const std::string &text) { - if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)) - { - return 0; - } + ModResult res = ServerInstance->OnCheckExemption(user,dest,"flood"); + if (!IS_LOCAL(user) || res == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; - floodsettings *f; - if (dest->GetExt("flood", f)) + floodsettings *f = mf.ext.get(dest); + if (f) { f->addmessage(user); if (f->shouldkick(user)) @@ -237,62 +226,44 @@ class ModuleMsgFlood : public Module parameters.push_back(dest->name); parameters.push_back("+b"); parameters.push_back(user->MakeWildHost()); - ServerInstance->SendMode(parameters, ServerInstance->FakeClient); - - ServerInstance->PI->SendModeStr(dest->name, std::string("+b ") + user->MakeWildHost()); + ServerInstance->SendGlobalMode(parameters, ServerInstance->FakeClient); } char kickmessage[MAXBUF]; snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs); - if (!dest->ServerKickUser(user, kickmessage, true)) - { - delete dest; - } + dest->KickUser(ServerInstance->FakeClient, user, kickmessage); - return 1; + 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) + ModResult 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); - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list) + ModResult OnUserPreNotice(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); - return 0; + return MOD_RES_PASSTHRU; } - void OnChannelDelete(Channel* chan) - { - floodsettings* f; - if (chan->GetExt("flood", f)) - { - delete f; - chan->Shrink("flood"); - } - } - - - virtual ~ModuleMsgFlood() + ~ModuleMsgFlood() { - ServerInstance->Modes->DelMode(mf); - delete mf; } - virtual Version GetVersion() + Version GetVersion() { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Provides channel mode +f (message flood protection)", VF_VENDOR); } };