X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=54e221019ccd372a4c2b977c4baf91c4d8de19c3;hb=de25d946733f774e3a5b53a58438a9c92af0acbe;hp=3d342b636357f3efd72bb29ed750fff8de765c81;hpb=2b8ce39c6ea5e7a22fe39b21756f82051465f143;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index 3d342b636..54e221019 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.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 +j (join flood protection) */ @@ -23,20 +20,16 @@ class joinfloodsettings : public classbase { public: - int secs; int joins; time_t reset; 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; + reset = ServerInstance->Time() + secs; counter = 0; locked = false; }; @@ -44,10 +37,10 @@ class joinfloodsettings : public classbase void addjoin() { counter++; - if (time(NULL) > reset) + if (ServerInstance->Time() > reset) { counter = 0; - reset = time(NULL) + secs; + reset = ServerInstance->Time() + secs; } } @@ -65,7 +58,7 @@ class joinfloodsettings : public classbase { if (locked) { - if (time(NULL) > unlocktime) + if (ServerInstance->Time() > unlocktime) { locked = false; return false; @@ -81,7 +74,7 @@ class joinfloodsettings : public classbase void lock() { locked = true; - unlocktime = time(NULL) + 60; + unlocktime = ServerInstance->Time() + 60; } }; @@ -91,27 +84,21 @@ class joinfloodsettings : public classbase class JoinFlood : public ModeHandler { public: - JoinFlood(InspIRCd* Instance) : ModeHandler(Instance, 'j', 1, 0, false, MODETYPE_CHANNEL, false) { } + SimpleExtItem ext; + JoinFlood(Module* Creator) : ModeHandler(Creator, 'j', PARAM_SETONLY, MODETYPE_CHANNEL), + ext("joinflood", Creator) { } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { - joinfloodsettings* x; - if (channel->GetExt("joinflood",x)) + joinfloodsettings* x = ext.get(channel); + if (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) - { - /* 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) { - joinfloodsettings* dummy; - if (adding) { char ndata[MAXBUF]; @@ -138,19 +125,19 @@ class JoinFlood : public ModeHandler int nsecs = atoi(secs); if ((njoins<1) || (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("joinflood", dummy)) + joinfloodsettings* f = ext.get(channel); + if (!f) { parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs); - joinfloodsettings *f = new joinfloodsettings(nsecs,njoins); - channel->Extend("joinflood", f); - channel->SetMode('j', true); - channel->SetModeParam('j', parameter.c_str(), true); + f = new joinfloodsettings(nsecs, njoins); + ext.set(channel, f); + channel->SetModeParam('j', parameter); return MODEACTION_ALLOW; } else @@ -167,14 +154,9 @@ class JoinFlood : public ModeHandler // 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); + f = new joinfloodsettings(nsecs, njoins); + ext.set(channel, f); + channel->SetModeParam('j', parameter); return MODEACTION_ALLOW; } else @@ -187,19 +169,17 @@ class JoinFlood : 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()); return MODEACTION_DENY; } } else { - if (channel->GetExt("joinflood", dummy)) + joinfloodsettings* f = ext.get(channel); + if (f) { - joinfloodsettings *f; - channel->GetExt("joinflood", f); - DELETE(f); - channel->Shrink("joinflood"); - channel->SetMode('j', false); + ext.unset(channel); + channel->SetModeParam('j', ""); return MODEACTION_ALLOW; } } @@ -209,76 +189,65 @@ class JoinFlood : public ModeHandler class ModuleJoinFlood : public Module { - - JoinFlood* jf; - + + JoinFlood jf; + public: - - ModuleJoinFlood(InspIRCd* Me) - : Module(Me) + + ModuleJoinFlood() + : jf(this) { - - jf = new JoinFlood(ServerInstance); - if (!ServerInstance->AddMode(jf, 'j')) + + if (!ServerInstance->Modes->AddMode(&jf)) throw ModuleException("Could not add new modes!"); + Extensible::Register(&jf.ext); + Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreJoin, I_OnUserJoin }; + ServerInstance->Modules->Attach(eventlist, this, 3); } - - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) + + ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { if (chan) { - joinfloodsettings *f; - if (chan->GetExt("joinflood", f)) + joinfloodsettings *f = jf.ext.get(chan); + if (f && f->islocked()) { - if (f->islocked()) - { - user->WriteServ("609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name); - return 1; - } + user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str()); + return MOD_RES_DENY; } } - return 0; + return MOD_RES_PASSTHRU; } - virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) + void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) { - joinfloodsettings *f; - if (channel->GetExt("joinflood",f)) + /* We arent interested in JOIN events caused by a network burst */ + if (sync) + return; + + joinfloodsettings *f = jf.ext.get(memb->chan); + + /* But all others are OK */ + if (f) { f->addjoin(); if (f->shouldlock()) { f->clear(); f->lock(); - 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); + memb->chan->WriteChannelWithServ((char*)ServerInstance->Config->ServerName.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.", memb->chan->name.c_str(), f->joins, f->secs); } } } - void OnChannelDelete(chanrec* chan) - { - joinfloodsettings *f; - if (chan->GetExt("joinflood",f)) - { - DELETE(f); - chan->Shrink("joinflood"); - } - } - - void Implements(char* List) + ~ModuleJoinFlood() { - List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1; + ServerInstance->Modes->DelMode(&jf); } - virtual ~ModuleJoinFlood() - { - ServerInstance->Modes->DelMode(jf); - DELETE(jf); - } - - virtual Version GetVersion() + Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Provides channel mode +j (join flood protection)", VF_COMMON | VF_VENDOR, API_VERSION); } };