X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=3241020bfb32aa358b1580c4c749176918c09769;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=a15c48bc9662e1491bffb304bd7defa40a5e1b00;hpb=59c81b058084260c201938672d69cc6245a25301;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index a15c48bc9..3241020bf 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -1,60 +1,66 @@ -/* +------------------------------------+ - * | 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) 2013, 2016-2020 Sadie Powell + * Copyright (C) 2012-2014 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006-2007, 2010 Craig Edwards * - * --------------------------------------------------- + * 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 "inspircd.h" +#include "modules/server.h" + +enum +{ + // From RFC 2182. + ERR_UNAVAILRESOURCE = 437 +}; -/* $ModDesc: Provides channel mode +f (message flood protection) */ +// The number of seconds the channel will be closed for. +static unsigned int duration; +/** Holds settings and state associated with channel mode +j + */ class joinfloodsettings { 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() : secs(0), joins(0) {}; - joinfloodsettings(int b, int c) : secs(b), joins(c) + joinfloodsettings(unsigned int b, unsigned int c) + : secs(b), joins(c), unlocktime(0), counter(0) { - reset = time(NULL) + secs; - counter = 0; - locked = false; - log(DEBUG,"Create new joinfloodsettings: %lu %lu",time(NULL),reset); - }; + reset = ServerInstance->Time() + secs; + } 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; + counter = 1; + reset = ServerInstance->Time() + secs; } + else + counter++; } bool shouldlock() @@ -64,215 +70,144 @@ class joinfloodsettings void clear() { - log(DEBUG,"joinflood counter clear"); counter = 0; } bool islocked() { - if (locked) - { - if (time(NULL) > unlocktime) - { - locked = false; - return false; - } - else - { - return true; - } - } - return false; + if (ServerInstance->Time() > unlocktime) + unlocktime = 0; + + return (unlocktime != 0); } void lock() { - log(DEBUG,"joinflood lock"); - locked = true; - unlocktime = time(NULL) + 60; + unlocktime = ServerInstance->Time() + duration; } - + bool operator==(const joinfloodsettings& other) const + { + return ((this->secs == other.secs) && (this->joins == other.joins)); + } }; -class ModuleJoinFlood : public Module +/** Handles channel mode +j + */ +class JoinFlood : public ParamMode > { - Server *Srv; - public: - - ModuleJoinFlood(Server* Me) - : Module::Module(Me) + JoinFlood(Module* Creator) + : ParamMode >(Creator, "joinflood", 'j') { - Srv = Me; - Srv->AddExtendedMode('j',MT_CHANNEL,false,1,0); - } - - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) - { - if ((modechar == 'j') && (type == MT_CHANNEL)) - { - if (mode_on) - { - 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 == ':') - { - *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)) - { - WriteServ(user->fd,"608 %s %s :Invalid flood parameter",user->nick,c->name); - return 0; - } - else - { - if (!c->GetExt("joinflood")) - { - joinfloodsettings *f = new joinfloodsettings(nsecs,njoins); - c->Extend("joinflood",(char*)f); - } - } - 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"); - } - } - return 1; - } - return 0; + syntax = ":"; } - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE { - if (chan) + std::string::size_type colon = parameter.find(':'); + if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos)) { - joinfloodsettings *f = (joinfloodsettings*)chan->GetExt("joinflood"); - if (f) - { - if (f->islocked()) - { - WriteServ(user->fd,"609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name); - return 1; - } - } + source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter)); + return MODEACTION_DENY; } - return 0; - } - virtual void OnUserJoin(userrec* user, chanrec* channel) - { - joinfloodsettings *f = (joinfloodsettings*)channel->GetExt("joinflood"); - if (f) + /* Set up the flood parameters for this channel */ + unsigned int njoins = ConvToNum(parameter.substr(0, colon)); + unsigned int nsecs = ConvToNum(parameter.substr(colon+1)); + if ((njoins<1) || (nsecs<1)) { - 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); - } + source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter)); + return MODEACTION_DENY; } - } - void OnChannelDelete(chanrec* chan) - { - if (chan->GetExt("joinflood")) - { - joinfloodsettings *f = (joinfloodsettings*)chan->GetExt("joinflood"); - delete f; - chan->Shrink("joinflood"); - } + ext.set(channel, new joinfloodsettings(nsecs, njoins)); + return MODEACTION_ALLOW; } - void Implements(char* List) + void SerializeParam(Channel* chan, const joinfloodsettings* jfs, std::string& out) { - List[I_On005Numeric] = List[I_OnExtendedMode] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1; + out.append(ConvToStr(jfs->joins)).push_back(':'); + out.append(ConvToStr(jfs->secs)); } +}; + +class ModuleJoinFlood + : public Module + , public ServerProtocol::LinkEventListener +{ + private: + JoinFlood jf; + time_t ignoreuntil; + unsigned long bootwait; + unsigned long splitwait; - 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); - } + public: + // Stop GCC warnings about the deprecated OnServerSplit event. + using ServerProtocol::LinkEventListener::OnServerSplit; - virtual ~ModuleJoinFlood() + ModuleJoinFlood() + : ServerProtocol::LinkEventListener(this) + , jf(this) + , ignoreuntil(0) { } - - virtual Version GetVersion() + + void ReadConfig(ConfigStatus&) CXX11_OVERRIDE { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); + ConfigTag* tag = ServerInstance->Config->ConfValue("joinflood"); + duration = tag->getDuration("duration", 60, 10, 600); + bootwait = tag->getDuration("bootwait", 30); + splitwait = tag->getDuration("splitwait", 30); + + ignoreuntil = ServerInstance->startup_time + bootwait; } -}; + void OnServerSplit(const Server* server, bool error) CXX11_OVERRIDE + { + if (splitwait) + ignoreuntil = ServerInstance->Time() + splitwait; + } -class ModuleJoinFloodFactory : public ModuleFactory -{ - public: - ModuleJoinFloodFactory() + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { + if (chan) + { + joinfloodsettings *f = jf.ext.get(chan); + if (f && f->islocked()) + { + user->WriteNumeric(ERR_UNAVAILRESOURCE, chan->name, "This channel is temporarily unavailable (+j is set). Please try again later."); + return MOD_RES_DENY; + } + } + return MOD_RES_PASSTHRU; } - - ~ModuleJoinFloodFactory() + + void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE { + /* We arent interested in JOIN events caused by a network burst */ + if (sync || ignoreuntil > ServerInstance->Time()) + 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(); + memb->chan->WriteNotice(InspIRCd::Format("This channel has been closed to new users for %u seconds because there have been more than %d joins in %d seconds.", duration, f->joins, f->secs)); + } + } } - - virtual Module * CreateModule(Server* Me) + + Version GetVersion() CXX11_OVERRIDE { - return new ModuleJoinFlood(Me); + return Version("Adds channel mode j (joinflood) which helps protect against spammers which mass-join channels.", VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleJoinFloodFactory; -} - +MODULE_INIT(ModuleJoinFlood)