X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_joinflood.cpp;h=466ceb52e27f88088cbed0a8dd612c0c8b7d1e95;hb=83137d5f9274832f152acc7d19de3cb0897f9630;hp=3f3c44d98912c08df007d80aa31c30c4d9820d80;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index 3f3c44d98..466ceb52e 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -2,30 +2,21 @@ * | 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-2008 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 +j (join flood protection) */ +/** Holds settings and state associated with channel mode +j + */ class joinfloodsettings : public classbase { public: @@ -36,23 +27,22 @@ class joinfloodsettings : public classbase time_t unlocktime; int counter; bool locked; + InspIRCd* ServerInstance; joinfloodsettings() : secs(0), joins(0) {}; + joinfloodsettings(int b, int c) : secs(b), joins(c) { reset = time(NULL) + secs; counter = 0; locked = false; - log(DEBUG,"Create new joinfloodsettings: %lu %lu",time(NULL),reset); }; void addjoin() { counter++; - log(DEBUG,"joinflood counter is %d",counter); if (time(NULL) > reset) { - log(DEBUG,"joinflood counter reset"); counter = 0; reset = time(NULL) + secs; } @@ -65,7 +55,6 @@ class joinfloodsettings : public classbase void clear() { - log(DEBUG,"joinflood counter clear"); counter = 0; } @@ -88,34 +77,35 @@ class joinfloodsettings : public classbase void lock() { - log(DEBUG,"joinflood lock"); locked = true; unlocktime = time(NULL) + 60; } }; +/** Handles channel mode +j + */ class JoinFlood : public ModeHandler { public: - JoinFlood() : ModeHandler('j', 1, 0, false, MODETYPE_CHANNEL, false) { } + JoinFlood(InspIRCd* Instance) : ModeHandler(Instance, 'j', 1, 0, false, MODETYPE_CHANNEL, false) { } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) - { - joinfloodsettings* x; - if (channel->GetExt("joinflood",x)) - return std::make_pair(true, ConvToStr(x->joins)+":"+ConvToStr(x->secs)); - else - return std::make_pair(false, parameter); - } + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + { + joinfloodsettings* x; + if (channel->GetExt("joinflood",x)) + return std::make_pair(true, ConvToStr(x->joins)+":"+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) + 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(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) { joinfloodsettings* dummy; @@ -138,6 +128,7 @@ class JoinFlood : public ModeHandler else data++; } if (secs) + { /* Set up the flood parameters for this channel */ int njoins = atoi(joins); @@ -145,7 +136,7 @@ class JoinFlood : public ModeHandler if ((njoins<1) || (nsecs<1)) { source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name); - parameter = ""; + parameter.clear(); return MODEACTION_DENY; } else @@ -159,6 +150,36 @@ class JoinFlood : public ModeHandler channel->SetModeParam('j', parameter.c_str(), true); return MODEACTION_ALLOW; } + else + { + std::string cur_param = channel->GetModeParameter('j'); + parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs); + if (cur_param == parameter) + { + // mode params match + return MODEACTION_DENY; + } + else + { + // new mode param, replace old with new + if ((nsecs > 0) && (njoins > 0)) + { + joinfloodsettings* f; + channel->GetExt("joinflood", f); + delete f; + f = new joinfloodsettings(nsecs,njoins); + channel->Shrink("joinflood"); + channel->Extend("joinflood", f); + channel->SetModeParam('j', cur_param.c_str(), false); + channel->SetModeParam('j', parameter.c_str(), true); + return MODEACTION_ALLOW; + } + else + { + return MODEACTION_DENY; + } + } + } } } else @@ -173,7 +194,7 @@ class JoinFlood : public ModeHandler { joinfloodsettings *f; channel->GetExt("joinflood", f); - DELETE(f); + delete f; channel->Shrink("joinflood"); channel->SetMode('j', false); return MODEACTION_ALLOW; @@ -185,20 +206,23 @@ class JoinFlood : public ModeHandler class ModuleJoinFlood : public Module { - Server *Srv; + JoinFlood* jf; public: - ModuleJoinFlood(Server* Me) - : Module::Module(Me) + ModuleJoinFlood(InspIRCd* Me) + : Module(Me) { - Srv = Me; - jf = new JoinFlood(); - Srv->AddMode(jf, 'j'); + + jf = new JoinFlood(ServerInstance); + if (!ServerInstance->Modes->AddMode(jf)) + throw ModuleException("Could not add new modes!"); + Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreJoin, I_OnUserJoin }; + ServerInstance->Modules->Attach(eventlist, this, 3); } - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) + virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs) { if (chan) { @@ -215,9 +239,15 @@ class ModuleJoinFlood : public Module return 0; } - virtual void OnUserJoin(userrec* user, chanrec* channel) + virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) { joinfloodsettings *f; + + /* We arent interested in JOIN events caused by a network burst */ + if (sync) + return; + + /* But all others are OK */ if (channel->GetExt("joinflood",f)) { f->addjoin(); @@ -225,64 +255,32 @@ class ModuleJoinFlood : public Module { f->clear(); f->lock(); - channel->WriteChannelWithServ((char*)Srv->GetServerName().c_str(), "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", channel->name, f->joins, f->secs); + channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", channel->name, f->joins, f->secs); } } } - void OnChannelDelete(chanrec* chan) + void OnChannelDelete(Channel* chan) { joinfloodsettings *f; if (chan->GetExt("joinflood",f)) { - DELETE(f); + delete f; chan->Shrink("joinflood"); } } - void Implements(char* List) - { - List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1; - } - - virtual void On005Numeric(std::string &output) - { - InsertMode(output, "j", 3); - } virtual ~ModuleJoinFlood() { - DELETE(jf); + ServerInstance->Modes->DelMode(jf); + delete jf; } virtual Version GetVersion() { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); - } -}; - - -class ModuleJoinFloodFactory : public ModuleFactory -{ - public: - ModuleJoinFloodFactory() - { - } - - ~ModuleJoinFloodFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleJoinFlood(Me); + return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleJoinFloodFactory; -} - +MODULE_INIT(ModuleJoinFlood)