X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=63bcc38a4180c30526814f66ee6396d433b94ae8;hb=4e24fb7c19cff866eda602349fbafce78b7e4c51;hp=7603e36d50a841ad72b5e7b03ff8e7bcf484d395;hpb=b37a253d962ed7af1ea7a328abf2a1af74f30759;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index 7603e36d5..63bcc38a4 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -1,38 +1,35 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2006-2007 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * --------------------------------------------------- + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -using namespace std; -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" -#include "configreader.h" #include "inspircd.h" /* $ModDesc: Provides channel mode +j (join flood protection) */ -extern InspIRCd* ServerInstance; - -class joinfloodsettings : public classbase +/** Holds settings and state associated with channel mode +j + */ +class joinfloodsettings { public: - int secs; int joins; time_t reset; @@ -40,24 +37,20 @@ class joinfloodsettings : public classbase int counter; bool locked; - 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; - log(DEBUG,"Create new joinfloodsettings: %lu %lu",time(NULL),reset); }; void addjoin() { counter++; - log(DEBUG,"joinflood counter is %d",counter); - if (time(NULL) > reset) + if (ServerInstance->Time() > reset) { - log(DEBUG,"joinflood counter reset"); counter = 0; - reset = time(NULL) + secs; + reset = ServerInstance->Time() + secs; } } @@ -68,7 +61,6 @@ class joinfloodsettings : public classbase void clear() { - log(DEBUG,"joinflood counter clear"); counter = 0; } @@ -76,7 +68,7 @@ class joinfloodsettings : public classbase { if (locked) { - if (time(NULL) > unlocktime) + if (ServerInstance->Time() > unlocktime) { locked = false; return false; @@ -91,37 +83,23 @@ class joinfloodsettings : public classbase void lock() { - log(DEBUG,"joinflood lock"); locked = true; - unlocktime = time(NULL) + 60; + unlocktime = ServerInstance->Time() + 60; } }; +/** Handles channel mode +j + */ class JoinFlood : public ModeHandler { public: - 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); - } + SimpleExtItem ext; + JoinFlood(Module* Creator) : ModeHandler(Creator, "joinflood", 'j', PARAM_SETONLY, MODETYPE_CHANNEL), + ext("joinflood", Creator) { } - bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - /* 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) - { - joinfloodsettings* dummy; - if (adding) { char ndata[MAXBUF]; @@ -141,44 +119,60 @@ class JoinFlood : public ModeHandler 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 = ""; + 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 + { + 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 + f = new joinfloodsettings(nsecs, njoins); + ext.set(channel, f); + channel->SetModeParam('j', parameter); + return MODEACTION_ALLOW; + } + } } } 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)) + if (channel->IsModeSet('j')) { - joinfloodsettings *f; - channel->GetExt("joinflood", f); - DELETE(f); - channel->Shrink("joinflood"); - channel->SetMode('j', false); + ext.unset(channel); + channel->SetModeParam('j', ""); return MODEACTION_ALLOW; } } @@ -188,104 +182,67 @@ class JoinFlood : public ModeHandler class ModuleJoinFlood : public Module { - Server *Srv; - JoinFlood* jf; - + + JoinFlood jf; + public: - - ModuleJoinFlood(InspIRCd* Me) - : Module::Module(Me) + + ModuleJoinFlood() + : jf(this) + { + } + + void init() { - - jf = new JoinFlood(ServerInstance); - Srv->AddMode(jf, 'j'); + ServerInstance->Modules->AddService(jf); + ServerInstance->Modules->AddService(jf.ext); + Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserJoin }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) + + 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) + 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->islocked())) { 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) + ~ModuleJoinFlood() { - joinfloodsettings *f; - if (chan->GetExt("joinflood",f)) - { - DELETE(f); - chan->Shrink("joinflood"); - } } - void Implements(char* List) + Version GetVersion() { - List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1; - } - - virtual void On005Numeric(std::string &output) - { - ServerInstance->ModeGrok->InsertMode(output, "j", 3); - } - - virtual ~ModuleJoinFlood() - { - DELETE(jf); - } - - virtual Version GetVersion() - { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); + return Version("Provides channel mode +j (join flood protection)", VF_VENDOR); } }; - -class ModuleJoinFloodFactory : public ModuleFactory -{ - public: - ModuleJoinFloodFactory() - { - } - - ~ModuleJoinFloodFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleJoinFlood(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleJoinFloodFactory; -} - +MODULE_INIT(ModuleJoinFlood)