X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=ccaf0a402763ff1f9e6a23defadf437ccb812c24;hb=9ebd9cba72056c5b36696e166826afb981f25ebb;hp=e7dd6e272eace3cbc85e184f95b5d44bc42561fa;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index e7dd6e272..ccaf0a402 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -17,7 +17,7 @@ /** Holds flood settings and state for mode +f */ -class floodsettings : public classbase +class floodsettings { public: bool ban; @@ -26,10 +26,9 @@ class floodsettings : public classbase time_t reset; std::map counters; - floodsettings() : ban(0), secs(0), lines(0) {}; floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c) { - reset = time(NULL) + secs; + reset = ServerInstance->Time() + secs; }; void addmessage(User* who) @@ -43,10 +42,10 @@ class floodsettings : public classbase { counters[who] = 1; } - if (time(NULL) > reset) + if (ServerInstance->Time() > reset) { counters.clear(); - reset = time(NULL) + secs; + reset = ServerInstance->Time() + secs; } } @@ -75,26 +74,13 @@ class floodsettings : public classbase class MsgFlood : public ModeHandler { public: - MsgFlood(InspIRCd* Instance) : ModeHandler(Instance, 'f', 1, 0, false, MODETYPE_CHANNEL, false) { } - - ModePair ModeSet(User* source, User* dest, Channel* 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, Channel* channel) - { - /* When TS is equal, the alphabetically later one wins */ - return (their_param < our_param); - } + SimpleExtItem ext; + MsgFlood(Module* Creator) : ModeHandler(Creator, "flood", 'f', PARAM_SETONLY, MODETYPE_CHANNEL), + ext("messageflood", Creator) { } ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - floodsettings *f; + floodsettings *f = ext.get(channel); if (adding) { @@ -129,21 +115,20 @@ class MsgFlood : public ModeHandler /* Set up the flood parameters for this channel */ int nlines = atoi(lines); int nsecs = atoi(secs); - if ((nlines<1) || (nsecs<1)) + if ((nlines<2) || (nsecs<1)) { - source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name); + source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str()); parameter.clear(); return MODEACTION_DENY; } else { - if (!channel->GetExt("flood", f)) + if (!f) { parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs); - floodsettings *f = new floodsettings(ban,nsecs,nlines); - channel->Extend("flood",f); - 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 @@ -157,14 +142,11 @@ class MsgFlood : public ModeHandler } else { - if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban)) + if ((((nlines != f->lines) || (nsecs != f->secs) || (ban != f->ban))) && (((nsecs > 0) && (nlines > 0)))) { - delete f; - floodsettings *f = new floodsettings(ban,nsecs,nlines); - channel->Shrink("flood"); - channel->Extend("flood",f); - 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 @@ -177,51 +159,49 @@ class MsgFlood : public ModeHandler } else { - source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name); + source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str()); parameter.clear(); return MODEACTION_DENY; } } 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; } } - + return MODEACTION_DENY; } }; class ModuleMsgFlood : public Module { - - MsgFlood* mf; - + MsgFlood mf; + public: - - ModuleMsgFlood(InspIRCd* Me) - : Module(Me) + + ModuleMsgFlood() + : mf(this) { - - mf = new MsgFlood(ServerInstance); - if (!ServerInstance->AddMode(mf, 'f')) + if (!ServerInstance->Modes->AddMode(&mf)) throw ModuleException("Could not add new modes!"); + 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)) @@ -230,77 +210,48 @@ class ModuleMsgFlood : public Module f->clear(user); if (f->ban) { - const char* parameters[3]; - parameters[0] = dest->name; - parameters[1] = "+b"; - parameters[2] = user->MakeWildHost(); - 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 - * module and formed into a ban command that - * suits the protocol in use. - */ - n.push_back(dest->name); - n.push_back("+b"); - n.push_back(user->MakeWildHost()); - Event rmode((char *)&n, NULL, "send_mode"); - rmode.Send(ServerInstance); + std::vector parameters; + parameters.push_back(dest->name); + parameters.push_back("+b"); + parameters.push_back(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; - return 1; - } + + dest->KickUser(ServerInstance->FakeClient, user, kickmessage); + + 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; - } - void OnChannelDelete(Channel* chan) - { - floodsettings* f; - if (chan->GetExt("flood", f)) - { - DELETE(f); - chan->Shrink("flood"); - } + return MOD_RES_PASSTHRU; } - void Implements(char* List) + ~ModuleMsgFlood() { - List[I_OnChannelDelete] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1; } - virtual ~ModuleMsgFlood() - { - ServerInstance->Modes->DelMode(mf); - DELETE(mf); - } - - virtual Version GetVersion() + Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Provides channel mode +f (message flood protection)", VF_VENDOR); } };