X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=51e20fe7ee4bc5e4d073b8a3facce0e3761f41ba;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=9a9f684e5d75046e5892d061a396cadca647a5b0;hpb=6aecd4c9ec0e09d04a6a5e59182a229b3c374b69;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index 9a9f684e5..51e20fe7e 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -11,11 +11,6 @@ * --------------------------------------------------- */ -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" /* $ModDesc: Provides channel mode +f (message flood protection) */ @@ -82,14 +77,14 @@ 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(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + { floodsettings* x; - if (channel->GetExt("flood",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); - } + 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) { @@ -137,7 +132,7 @@ class MsgFlood : public ModeHandler if ((nlines<1) || (nsecs<1)) { source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name); - parameter = ""; + parameter.clear(); return MODEACTION_DENY; } else @@ -153,15 +148,29 @@ class MsgFlood : public ModeHandler } 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) + { + // mode params match + return MODEACTION_DENY; + } + else { - 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; + if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban)) + { + 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); + return MODEACTION_ALLOW; + } + else + { + return MODEACTION_DENY; + } } } } @@ -169,7 +178,7 @@ class MsgFlood : public ModeHandler else { source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name); - parameter = ""; + parameter.clear(); return MODEACTION_DENY; } } @@ -196,65 +205,76 @@ class ModuleMsgFlood : public Module public: ModuleMsgFlood(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { mf = new MsgFlood(ServerInstance); - ServerInstance->AddMode(mf, 'f'); + if (!ServerInstance->AddMode(mf, 'f')) + throw ModuleException("Could not add new modes!"); } - void ProcessMessages(userrec* user,chanrec* dest, const std::string &text) + int ProcessMessages(userrec* user,chanrec* dest, const std::string &text) { - if (IS_LOCAL(user)) + if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP) + { + return 0; + } + + floodsettings *f; + if (dest->GetExt("flood", f)) { - floodsettings *f; - if (dest->GetExt("flood", f)) + f->addmessage(user); + if (f->shouldkick(user)) { - f->addmessage(user); - if (f->shouldkick(user)) + /* Youre outttta here! */ + f->clear(user); + if (f->ban) { - /* Youre outttta here! */ - 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); - } - dest->ServerKickUser(user, "Channel flood triggered (mode +f)", true); + 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); + } + 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; } } } + + 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(userrec *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,(chanrec*)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(userrec *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,(chanrec*)dest,text); + + return 0; } void OnChannelDelete(chanrec* chan) @@ -269,7 +289,7 @@ class ModuleMsgFlood : public Module void Implements(char* List) { - List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1; + List[I_OnChannelDelete] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1; } virtual ~ModuleMsgFlood() @@ -284,28 +304,4 @@ class ModuleMsgFlood : public Module } }; - -class ModuleMsgFloodFactory : public ModuleFactory -{ - public: - ModuleMsgFloodFactory() - { - } - - ~ModuleMsgFloodFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleMsgFlood(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleMsgFloodFactory; -} - +MODULE_INIT(ModuleMsgFlood)