X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=012c95a8e8cfe89972c6c58df9e9beb0c419558b;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=04f9766d55f8d2a2016bf62221d0837ddbfe7be2;hpb=bb0d5b432568ff5fccb6bc734b1576b90280c722;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index 04f9766d5..012c95a8e 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -2,30 +2,27 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - #include #include #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" /* $ModDesc: Provides channel mode +f (message flood protection) */ -class floodsettings +/** Holds flood settings and state for mode +f + */ +class floodsettings : public classbase { public: bool ban; @@ -38,7 +35,6 @@ class floodsettings floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c) { reset = time(NULL) + secs; - log(DEBUG,"Create new floodsettings: %lu %lu",time(NULL),reset); }; void addmessage(userrec* who) @@ -47,16 +43,13 @@ class floodsettings if (iter != counters.end()) { iter->second++; - log(DEBUG,"Count for %s is now %d",who->nick,iter->second); } else { counters[who] = 1; - log(DEBUG,"Count for %s is now *1*",who->nick); } if (time(NULL) > reset) { - log(DEBUG,"floodsettings timer Resetting."); counters.clear(); reset = time(NULL) + secs; } @@ -67,7 +60,6 @@ class floodsettings std::map::iterator iter = counters.find(who); if (iter != counters.end()) { - log(DEBUG,"should kick? %d, %d",iter->second,this->lines); return (iter->second >= this->lines); } else return false; @@ -83,13 +75,32 @@ class floodsettings } }; +/** Handles channel mode +f + */ class MsgFlood : public ModeHandler { public: - MsgFlood() : ModeHandler('f', 1, 0, false, MODETYPE_CHANNEL, false) { } + MsgFlood(InspIRCd* Instance) : ModeHandler(Instance, 'f', 1, 0, false, MODETYPE_CHANNEL, false) { } + + ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + { + 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, chanrec* channel) + { + /* When TS is equal, the alphabetically later one wins */ + return (their_param < our_param); + } ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { + floodsettings *f; + if (adding) { char ndata[MAXBUF]; @@ -125,35 +136,47 @@ class MsgFlood : public ModeHandler int nsecs = atoi(secs); if ((nlines<1) || (nsecs<1)) { - WriteServ(source->fd,"608 %s %s :Invalid flood parameter",source->nick,channel->name); + source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name); parameter = ""; return MODEACTION_DENY; } else { - if (!channel->GetExt("flood")) + if (!channel->GetExt("flood", f)) { - parameter = ConvToStr(nlines) + ":" +ConvToStr(nsecs); + parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs); floodsettings *f = new floodsettings(ban,nsecs,nlines); - channel->Extend("flood",(char*)f); + channel->Extend("flood",f); channel->SetMode('f', true); channel->SetModeParam('f', parameter.c_str(), true); return MODEACTION_ALLOW; } + else + { + if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban)) + { + delete f; + floodsettings *f = new floodsettings(ban,nsecs,nlines); + parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs); + channel->Shrink("flood"); + channel->Extend("flood",f); + channel->SetModeParam('f', parameter.c_str(), true); + return MODEACTION_ALLOW; + } + } } } else { - WriteServ(source->fd,"608 %s %s :Invalid flood parameter",source->nick,channel->name); + source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name); parameter = ""; return MODEACTION_DENY; } } else { - if (channel->GetExt("flood")) + if (channel->GetExt("flood", f)) { - floodsettings *f = (floodsettings*)channel->GetExt("flood"); DELETE(f); channel->Shrink("flood"); channel->SetMode('f', false); @@ -167,25 +190,26 @@ class MsgFlood : public ModeHandler class ModuleMsgFlood : public Module { - Server *Srv; + MsgFlood* mf; public: - ModuleMsgFlood(Server* Me) + ModuleMsgFlood(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; - mf = new MsgFlood(); - Srv->AddMode(mf, 'f'); + + mf = new MsgFlood(ServerInstance); + if (!ServerInstance->AddMode(mf, 'f')) + throw ModuleException("Could not add new modes!"); } void ProcessMessages(userrec* user,chanrec* dest, const std::string &text) { if (IS_LOCAL(user)) { - floodsettings *f = (floodsettings*)dest->GetExt("flood"); - if (f) + floodsettings *f; + if (dest->GetExt("flood", f)) { f->addmessage(user); if (f->shouldkick(user)) @@ -194,12 +218,12 @@ class ModuleMsgFlood : public Module f->clear(user); if (f->ban) { - char* parameters[3]; + const char* parameters[3]; parameters[0] = dest->name; parameters[1] = "+b"; parameters[2] = user->MakeWildHost(); - Srv->SendMode(parameters,3,user); - std::deque n; + ServerInstance->SendMode(parameters,3,user); + std::deque n; /* Propogate the ban to other servers. * We dont know what protocol we may be using, * so this event is picked up by our protocol @@ -210,15 +234,17 @@ class ModuleMsgFlood : public Module n.push_back("+b"); n.push_back(user->MakeWildHost()); Event rmode((char *)&n, NULL, "send_mode"); - rmode.Send(); + rmode.Send(ServerInstance); } - Srv->KickUser(NULL, user, dest, "Channel flood triggered (mode +f)"); + char kickmessage[MAXBUF]; + snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs); + dest->ServerKickUser(user, kickmessage, true); } } } } - virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status) + virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { if (target_type == TYPE_CHANNEL) { @@ -226,7 +252,7 @@ class ModuleMsgFlood : public Module } } - virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status) + virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { if (target_type == TYPE_CHANNEL) { @@ -236,9 +262,9 @@ class ModuleMsgFlood : public Module void OnChannelDelete(chanrec* chan) { - if (chan->GetExt("flood")) + floodsettings* f; + if (chan->GetExt("flood", f)) { - floodsettings *f = (floodsettings*)chan->GetExt("flood"); DELETE(f); chan->Shrink("flood"); } @@ -246,22 +272,18 @@ class ModuleMsgFlood : public Module void Implements(char* List) { - List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1; - } - - virtual void On005Numeric(std::string &output) - { - InsertMode(output, "f", 3); + List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1; } virtual ~ModuleMsgFlood() { + ServerInstance->Modes->DelMode(mf); DELETE(mf); } virtual Version GetVersion() { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); + return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } }; @@ -277,7 +299,7 @@ class ModuleMsgFloodFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleMsgFlood(Me); }