X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=087d8e47ee950aadeeb3694a5cf24b1689488907;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=1f6f0cea721233221ee9990beac400ea87720921;hpb=3f546994609ed717a63222cb16c5359a09ebff35;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index 1f6f0cea7..087d8e47e 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-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -12,9 +12,6 @@ */ #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" /* $ModDesc: Provides channel mode +f (message flood protection) */ @@ -22,22 +19,23 @@ */ class floodsettings : public classbase { + private: + InspIRCd *ServerInstance; public: bool ban; int secs; int lines; time_t reset; - std::map counters; + std::map counters; - floodsettings() : ban(0), secs(0), lines(0) {}; - floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c) + floodsettings(InspIRCd *Instance, bool a, int b, int c) : ServerInstance(Instance), ban(a), secs(b), lines(c) { - reset = time(NULL) + secs; + reset = ServerInstance->Time() + secs; }; - void addmessage(userrec* who) + void addmessage(User* who) { - std::map::iterator iter = counters.find(who); + std::map::iterator iter = counters.find(who); if (iter != counters.end()) { iter->second++; @@ -46,16 +44,16 @@ 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; } } - bool shouldkick(userrec* who) + bool shouldkick(User* who) { - std::map::iterator iter = counters.find(who); + std::map::iterator iter = counters.find(who); if (iter != counters.end()) { return (iter->second >= this->lines); @@ -63,9 +61,9 @@ class floodsettings : public classbase else return false; } - void clear(userrec* who) + void clear(User* who) { - std::map::iterator iter = counters.find(who); + std::map::iterator iter = counters.find(who); if (iter != counters.end()) { counters.erase(iter); @@ -80,7 +78,7 @@ class MsgFlood : public ModeHandler public: MsgFlood(InspIRCd* Instance) : ModeHandler(Instance, 'f', 1, 0, false, MODETYPE_CHANNEL, false) { } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { floodsettings* x; if (channel->GetExt("flood",x)) @@ -89,13 +87,7 @@ class MsgFlood : public ModeHandler 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) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) { floodsettings *f; @@ -132,9 +124,9 @@ 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; } @@ -143,30 +135,42 @@ class MsgFlood : public ModeHandler if (!channel->GetExt("flood", 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); + floodsettings *fs = new floodsettings(ServerInstance,ban,nsecs,nlines); + channel->Extend("flood",fs); + channel->SetModeParam('f', parameter); return MODEACTION_ALLOW; } else { - if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban)) + std::string cur_param = channel->GetModeParameter('f'); + parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs); + if (cur_param == parameter) { - 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; + // mode params match + return MODEACTION_DENY; + } + else + { + 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', parameter); + return MODEACTION_ALLOW; + } + else + { + return MODEACTION_DENY; + } } } } } 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; } @@ -175,38 +179,37 @@ class MsgFlood : public ModeHandler { if (channel->GetExt("flood", f)) { - DELETE(f); + delete f; channel->Shrink("flood"); - channel->SetMode('f', false); + channel->SetModeParam('f', ""); return MODEACTION_ALLOW; } } - + return MODEACTION_DENY; } }; class ModuleMsgFlood : public Module { - - MsgFlood* mf; - + MsgFlood mf; + public: - + ModuleMsgFlood(InspIRCd* Me) - : Module(Me) + : Module(Me), mf(Me) { - - mf = new MsgFlood(ServerInstance); - if (!ServerInstance->AddMode(mf, 'f')) + 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); } - - void ProcessMessages(userrec* user,chanrec* dest, const std::string &text) + + int ProcessMessages(User* user,Channel* dest, const std::string &text) { - if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP) + if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)) { - return; + return 0; } floodsettings *f; @@ -219,72 +222,66 @@ 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->SendMode(parameters, ServerInstance->FakeClient); + + ServerInstance->PI->SendModeStr(dest->name, std::string("+b ") + user->MakeWildHost()); } + 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); + + if (!dest->ServerKickUser(user, kickmessage)) + { + delete dest; + } + + return 1; } } + + return 0; } - virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) + virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list) { if (target_type == TYPE_CHANNEL) - { - ProcessMessages(user,(chanrec*)dest,text); - } + return ProcessMessages(user,(Channel*)dest,text); + + return 0; } - virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) + virtual int OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list) { if (target_type == TYPE_CHANNEL) - { - ProcessMessages(user,(chanrec*)dest,text); - } + return ProcessMessages(user,(Channel*)dest,text); + + return 0; } - void OnChannelDelete(chanrec* chan) + void OnChannelDelete(Channel* chan) { floodsettings* f; if (chan->GetExt("flood", f)) { - DELETE(f); + delete f; chan->Shrink("flood"); } } - void Implements(char* List) - { - List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1; - } virtual ~ModuleMsgFlood() { - ServerInstance->Modes->DelMode(mf); - DELETE(mf); + ServerInstance->Modes->DelMode(&mf); } - + virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } }; -MODULE_INIT(ModuleMsgFlood); +MODULE_INIT(ModuleMsgFlood)