X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=c1c50f2d480cac307f0388f8a39e791b7a80d2e4;hb=f07a2aa0866a8f953b41ba21592919f05d3a315e;hp=8d0716d224b47a84d44ffaadeb2a8a9765b844e6;hpb=2dfe8acc52c34a8aafcc40e2a47638a2e11c5326;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index 8d0716d22..c1c50f2d4 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -21,11 +21,14 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" +#include "configreader.h" +#include "inspircd.h" -/* $ModDesc: Provides channel mode +f (message flood protection) */ +/* $ModDesc: Provides channel mode +j (join flood protection) */ -class joinfloodsettings +/** Holds settings and state associated with channel mode +j + */ +class joinfloodsettings : public classbase { public: @@ -37,12 +40,12 @@ class joinfloodsettings bool locked; 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() @@ -88,98 +91,154 @@ class joinfloodsettings unlocktime = time(NULL) + 60; } - }; -class ModuleJoinFlood : public Module +/** Handles channel mode +j + */ +class JoinFlood : public ModeHandler { - Server *Srv; - public: - - ModuleJoinFlood(Server* Me) - : Module::Module(Me) + 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); + } + + bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) { - Srv = Me; - Srv->AddExtendedMode('j',MT_CHANNEL,false,1,0); + /* When TS is equal, the alphabetically later one wins */ + return (their_param < our_param); } - - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - if ((modechar == 'j') && (type == MT_CHANNEL)) + joinfloodsettings* dummy; + + if (adding) { - if (mode_on) + ServerInstance->Log(DEBUG,"Got parameter: '%s'",parameter.c_str()); + char ndata[MAXBUF]; + char* data = ndata; + strlcpy(ndata,parameter.c_str(),MAXBUF); + char* joins = data; + char* secs = NULL; + while (*data) { - std::string FloodParams = params[0]; - chanrec* c = (chanrec*)target; - char ndata[MAXBUF]; - char* data = ndata; - strlcpy(ndata,FloodParams.c_str(),MAXBUF); - char* joins = data; - char* secs = NULL; - while (*data) + if (*data == ':') { - if (*data == ':') - { - *data = 0; - data++; - secs = data; - break; - } - else data++; + *data = 0; + data++; + secs = data; + break; + } + else data++; + } + if (secs) + { + /* Set up the flood parameters for this channel */ + int njoins = atoi(joins); + int nsecs = atoi(secs); + if ((njoins<1) || (nsecs<1)) + { + source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name); + parameter = ""; + return MODEACTION_DENY; } - if (secs) + else { - /* Set up the flood parameters for this channel */ - int njoins = atoi(joins); - int nsecs = atoi(secs); - if ((njoins<1) || (nsecs<1)) + if (!channel->GetExt("joinflood", dummy)) { - WriteServ(user->fd,"608 %s %s :Invalid flood parameter",user->nick,c->name); - return 0; + 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); + return MODEACTION_ALLOW; } else { - if (!c->GetExt("joinflood")) + std::string cur_param = channel->GetModeParameter('j'); + parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs); + if (cur_param == parameter) { - joinfloodsettings *f = new joinfloodsettings(njoins,nsecs); - c->Extend("joinflood",(char*)f); + // 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; + } } } - return 1; } - else - { - WriteServ(user->fd,"608 %s %s :Invalid flood parameter",user->nick,c->name); - return 0; - } - } else { - chanrec* c = (chanrec*)target; - if (c->GetExt("joinflood")) - { - joinfloodsettings *f = (joinfloodsettings*)c->GetExt("joinflood"); - delete f; - c->Shrink("joinflood"); - } + source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name); + return MODEACTION_DENY; } - return 1; } - return 0; + else + { + if (channel->GetExt("joinflood", dummy)) + { + joinfloodsettings *f; + channel->GetExt("joinflood", f); + DELETE(f); + channel->Shrink("joinflood"); + channel->SetMode('j', false); + return MODEACTION_ALLOW; + } + } + return MODEACTION_DENY; } +}; - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) +class ModuleJoinFlood : public Module +{ + + JoinFlood* jf; + + public: + + ModuleJoinFlood(InspIRCd* Me) + : Module::Module(Me) + { + + jf = new JoinFlood(ServerInstance); + ServerInstance->AddMode(jf, 'j'); + } + + virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { if (chan) { - joinfloodsettings *f = (joinfloodsettings*)chan->GetExt("joinflood"); - if (f) + joinfloodsettings *f; + if (chan->GetExt("joinflood", f)) { if (f->islocked()) { - WriteServ(user->fd,"609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name); + user->WriteServ("609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name); return 1; } } @@ -189,61 +248,43 @@ class ModuleJoinFlood : public Module virtual void OnUserJoin(userrec* user, chanrec* channel) { - joinfloodsettings *f = (joinfloodsettings*)channel->GetExt("joinflood"); - if (f) + joinfloodsettings *f; + if (channel->GetExt("joinflood",f)) { f->addjoin(); if (f->shouldlock()) { f->clear(); f->lock(); - WriteChannelWithServ((char*)Srv->GetServerName().c_str(), channel, "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) { - if (chan->GetExt("joinflood")) + joinfloodsettings *f; + if (chan->GetExt("joinflood",f)) { - joinfloodsettings *f = (joinfloodsettings*)chan->GetExt("joinflood"); - delete f; + DELETE(f); chan->Shrink("joinflood"); } } void Implements(char* List) { - List[I_On005Numeric] = List[I_OnExtendedMode] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1; + List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1; } - virtual void On005Numeric(std::string &output) - { - std::stringstream line(output); - std::string temp1, temp2; - while (!line.eof()) - { - line >> temp1; - if (temp1.substr(0,10) == "CHANMODES=") - { - // By doing this we're *assuming* no other module has fucked up the CHANMODES= - // section of the 005 numeric. If they have, we're going DOWN in a blaze of glory, - // with a honking great EXCEPTION :) - temp1.insert(temp1.find(",")+1,"j"); - } - temp2 = temp2 + temp1 + " "; - } - if (temp2.length()) - output = temp2.substr(0,temp2.length()-1); - } - virtual ~ModuleJoinFlood() { + ServerInstance->Modes->DelMode(jf); + DELETE(jf); } virtual Version GetVersion() { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); + return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR); } }; @@ -259,7 +300,7 @@ class ModuleJoinFloodFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleJoinFlood(Me); }