X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=81ad7e1692de7560c2abe8f225debe3f9be107a7;hb=d736eba00b274c87662bd73a3acf8288135643d6;hp=cb8c90e098a155b23cabb5314c0b541dcf0352e4;hpb=d2a71fd3447c8bac65cc26077e2b9fc3fb0b28a7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index cb8c90e09..81ad7e169 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -1,49 +1,54 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * 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 program is free but copyrighted software; see - * the file COPYING for details. + * 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 . */ -#include "inspircd.h" -/* $ModDesc: Provides channel mode +j (join flood protection) */ +#include "inspircd.h" /** Holds settings and state associated with channel mode +j */ -class joinfloodsettings : public classbase +class joinfloodsettings { - private: - InspIRCd* ServerInstance; public: - int secs; - int joins; + unsigned int secs; + unsigned int joins; time_t reset; time_t unlocktime; - int counter; - bool locked; + unsigned int counter; - joinfloodsettings(InspIRCd *Instance, int b, int c) : ServerInstance(Instance), secs(b), joins(c) + joinfloodsettings(unsigned int b, unsigned int c) + : secs(b), joins(c), unlocktime(0), counter(0) { reset = ServerInstance->Time() + secs; - counter = 0; - locked = false; - }; + } void addjoin() { - counter++; if (ServerInstance->Time() > reset) { - counter = 0; + counter = 1; reset = ServerInstance->Time() + secs; } + else + counter++; } bool shouldlock() @@ -58,27 +63,21 @@ class joinfloodsettings : public classbase bool islocked() { - if (locked) - { - if (ServerInstance->Time() > unlocktime) - { - locked = false; - return false; - } - else - { - return true; - } - } - return false; + if (ServerInstance->Time() > unlocktime) + unlocktime = 0; + + return (unlocktime != 0); } void lock() { - locked = true; unlocktime = ServerInstance->Time() + 60; } + bool operator==(const joinfloodsettings& other) const + { + return ((this->secs == other.secs) && (this->joins == other.joins)); + } }; /** Handles channel mode +j @@ -86,113 +85,49 @@ 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, "joinflood", 'j', PARAM_SETONLY, MODETYPE_CHANNEL), + ext("joinflood", Creator) { } - ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - 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, Channel* channel) - { - /* When TS is equal, the alphabetically later one wins */ - return (their_param < our_param); - } - - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) - { - joinfloodsettings* dummy; - if (adding) { - char ndata[MAXBUF]; - char* data = ndata; - strlcpy(ndata,parameter.c_str(),MAXBUF); - char* joins = data; - char* secs = NULL; - while (*data) + std::string::size_type colon = parameter.find(':'); + if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos)) { - if (*data == ':') - { - *data = 0; - data++; - secs = data; - break; - } - else data++; + source->WriteNumeric(608, "%s :Invalid flood parameter",channel->name.c_str()); + return MODEACTION_DENY; } - if (secs) + /* Set up the flood parameters for this channel */ + unsigned int njoins = ConvToInt(parameter.substr(0, colon)); + unsigned int nsecs = ConvToInt(parameter.substr(colon+1)); + if ((njoins<1) || (nsecs<1)) { - /* Set up the flood parameters for this channel */ - int njoins = atoi(joins); - int nsecs = atoi(secs); - if ((njoins<1) || (nsecs<1)) - { - 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)) - { - parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs); - joinfloodsettings *f = new joinfloodsettings(ServerInstance, nsecs, njoins); - channel->Extend("joinflood", 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 - if ((nsecs > 0) && (njoins > 0)) - { - joinfloodsettings* f; - channel->GetExt("joinflood", f); - delete f; - f = new joinfloodsettings(ServerInstance, nsecs, njoins); - channel->Shrink("joinflood"); - channel->Extend("joinflood", f); - channel->SetModeParam('j', parameter); - return MODEACTION_ALLOW; - } - else - { - return MODEACTION_DENY; - } - } - } - } - } - else - { - source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str()); + source->WriteNumeric(608, "%s :Invalid flood parameter",channel->name.c_str()); return MODEACTION_DENY; } + + joinfloodsettings jfs(nsecs, njoins); + joinfloodsettings* f = ext.get(channel); + if ((f) && (*f == jfs)) + // mode params match + return MODEACTION_DENY; + + ext.set(channel, jfs); + parameter = ConvToStr(njoins) + ":" + ConvToStr(nsecs); + return MODEACTION_ALLOW; } else { - if (channel->GetExt("joinflood", dummy)) + if (!channel->IsModeSet(this)) + return MODEACTION_DENY; + + joinfloodsettings* f = ext.get(channel); + if (f) { - joinfloodsettings *f; - channel->GetExt("joinflood", f); - delete f; - channel->Shrink("joinflood"); - channel->SetModeParam('j', ""); + ext.unset(channel); return MODEACTION_ALLOW; } } @@ -202,80 +137,52 @@ 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->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(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { if (chan) { - joinfloodsettings *f; - if (chan->GetExt("joinflood", f)) + joinfloodsettings *f = jf.ext.get(chan); + if (f && f->islocked()) { - if (f->islocked()) - { - user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str()); - return 1; - } + user->WriteNumeric(609, "%s :This channel is temporarily unavailable (+j). Please try again later.",chan->name.c_str()); + return MOD_RES_DENY; } } - return 0; + return MOD_RES_PASSTHRU; } - virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) + void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE { - joinfloodsettings *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 (channel->GetExt("joinflood",f)) + 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.c_str(), 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(Channel* chan) - { - joinfloodsettings *f; - if (chan->GetExt("joinflood",f)) - { - delete f; - chan->Shrink("joinflood"); - } - } - - - virtual ~ModuleJoinFlood() - { - ServerInstance->Modes->DelMode(jf); - delete jf; - } - - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Provides channel mode +j (join flood protection)", VF_VENDOR); } };