X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nickflood.cpp;h=e20ab1258113c19b50542f222fb5f01afd180c6a;hb=HEAD;hp=edb5aff3ecfc1191944324811f1fece72234b53b;hpb=fbe8169b82cb071dd57b66941093df654aa7b22c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp index edb5aff3e..e20ab1258 100644 --- a/src/modules/m_nickflood.cpp +++ b/src/modules/m_nickflood.cpp @@ -1,58 +1,64 @@ -/* +------------------------------------+ - * | 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) 2013, 2016-2019 Sadie Powell + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2012, 2014 Attila Molnar + * Copyright (C) 2010 Craig Edwards + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2009 Robin Burchell * - * 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" +#include "modules/exemption.h" -/* $ModDesc: Provides channel mode +F (nick flood protection) */ +// The number of seconds nickname changing will be blocked for. +static unsigned int duration; /** Holds settings and state associated with channel mode +F */ -class nickfloodsettings : public classbase +class nickfloodsettings { - private: - InspIRCd* ServerInstance; public: - int secs; - int nicks; + unsigned int secs; + unsigned int nicks; time_t reset; time_t unlocktime; - int counter; - bool locked; + unsigned int counter; - nickfloodsettings(InspIRCd *Instance, int b, int c) : ServerInstance(Instance), secs(b), nicks(c) + nickfloodsettings(unsigned int b, unsigned int c) + : secs(b), nicks(c), unlocktime(0), counter(0) { - reset = Instance->Time() + secs; - counter = 0; - locked = false; - }; + reset = ServerInstance->Time() + secs; + } void addnick() { - counter++; if (ServerInstance->Time() > reset) { - counter = 0; + counter = 1; reset = ServerInstance->Time() + secs; } + else + counter++; } bool shouldlock() { - /* XXX HACK: using counter + 1 here now to allow the counter to only be incremented - * on successful nick changes; this will be checked before the counter is - * incremented. - */ - return (counter + 1 >= this->nicks); + return ((ServerInstance->Time() <= reset) && (counter == this->nicks)); } void clear() @@ -62,209 +68,130 @@ class nickfloodsettings : 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; + unlocktime = ServerInstance->Time() + duration; } - }; -/** Handles channel mode +j +/** Handles channel mode +F */ -class NickFlood : public ModeHandler +class NickFlood : public ParamMode > { public: - NickFlood(InspIRCd* Instance) : ModeHandler(Instance, 'F', 1, 0, false, MODETYPE_CHANNEL, false) { } - - ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + NickFlood(Module* Creator) + : ParamMode >(Creator, "nickflood", 'F') { - nickfloodsettings* x; - if (channel->GetExt("nickflood",x)) - return std::make_pair(true, ConvToStr(x->nicks)+":"+ConvToStr(x->secs)); - else - return std::make_pair(false, parameter); + syntax = ":"; } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE { - nickfloodsettings* dummy; - - if (adding) + std::string::size_type colon = parameter.find(':'); + if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos)) { - char ndata[MAXBUF]; - char* data = ndata; - strlcpy(ndata,parameter.c_str(),MAXBUF); - char* nicks = 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 nnicks = atoi(nicks); - int nsecs = atoi(secs); - if ((nnicks<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("nickflood", dummy)) - { - parameter = ConvToStr(nnicks) + ":" +ConvToStr(nsecs); - nickfloodsettings *f = new nickfloodsettings(ServerInstance, nsecs, nnicks); - channel->Extend("nickflood", f); - channel->SetModeParam('F', parameter); - return MODEACTION_ALLOW; - } - else - { - std::string cur_param = channel->GetModeParameter('F'); - parameter = ConvToStr(nnicks) + ":" +ConvToStr(nsecs); - if (cur_param == parameter) - { - // mode params match - return MODEACTION_DENY; - } - else - { - // new mode param, replace old with new - if ((nsecs > 0) && (nnicks > 0)) - { - nickfloodsettings* f; - channel->GetExt("nickflood", f); - delete f; - f = new nickfloodsettings(ServerInstance, nsecs, nnicks); - channel->Shrink("nickflood"); - channel->Extend("nickflood", f); - channel->SetModeParam('F', 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()); - return MODEACTION_DENY; - } + source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter)); + return MODEACTION_DENY; } - else + + /* Set up the flood parameters for this channel */ + unsigned int nnicks = ConvToNum(parameter.substr(0, colon)); + unsigned int nsecs = ConvToNum(parameter.substr(colon+1)); + + if ((nnicks<1) || (nsecs<1)) { - if (channel->GetExt("nickflood", dummy)) - { - nickfloodsettings *f; - channel->GetExt("nickflood", f); - delete f; - channel->Shrink("nickflood"); - channel->SetModeParam('F', ""); - return MODEACTION_ALLOW; - } + source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter)); + return MODEACTION_DENY; } - return MODEACTION_DENY; + + ext.set(channel, new nickfloodsettings(nsecs, nnicks)); + return MODEACTION_ALLOW; + } + + void SerializeParam(Channel* chan, const nickfloodsettings* nfs, std::string& out) + { + out.append(ConvToStr(nfs->nicks)).push_back(':'); + out.append(ConvToStr(nfs->secs)); } }; class ModuleNickFlood : public Module { - NickFlood jf; + CheckExemption::EventProvider exemptionprov; + NickFlood nf; public: - - ModuleNickFlood(InspIRCd* Me) - : Module(Me), jf(Me) + ModuleNickFlood() + : exemptionprov(this) + , nf(this) { - if (!ServerInstance->Modes->AddMode(&jf)) - throw ModuleException("Could not add new modes!"); - Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreNick, I_OnUserPostNick }; - ServerInstance->Modules->Attach(eventlist, this, 3); } - virtual int OnUserPreNick(User* user, const std::string &newnick) + void ReadConfig(ConfigStatus&) CXX11_OVERRIDE { - if (isdigit(newnick[0])) /* allow switches to UID */ - return 0; + ConfigTag* tag = ServerInstance->Config->ConfValue("nickflood"); + duration = tag->getDuration("duration", 60, 10, 600); + } - for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++) + ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE + { + for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++) { - Channel *channel = i->first; + Channel* channel = (*i)->chan; + ModResult res; - nickfloodsettings *f; - if (channel->GetExt("nickflood", f)) + nickfloodsettings *f = nf.ext.get(channel); + if (f) { - if (CHANOPS_EXEMPT(ServerInstance, 'F') && channel->GetStatus(user) == STATUS_OP) + res = CheckExemption::Call(exemptionprov, user, channel, "nickflood"); + if (res == MOD_RES_ALLOW) continue; if (f->islocked()) { - user->WriteNumeric(447, "%s :%s has been locked for nickchanges for 60 seconds because there have been more than %d nick changes in %d seconds", user->nick.c_str(), channel->name.c_str(), f->nicks, f->secs); - return 1; + user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("%s has been locked for nickchanges for %u seconds because there have been more than %u nick changes in %u seconds", channel->name.c_str(), duration, f->nicks, f->secs)); + return MOD_RES_DENY; } if (f->shouldlock()) { f->clear(); f->lock(); - channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :No nick changes are allowed for 60 seconds because there have been more than %d nick changes in %d seconds.", channel->name.c_str(), f->nicks, f->secs); - return 1; + channel->WriteNotice(InspIRCd::Format("No nick changes are allowed for %u seconds because there have been more than %u nick changes in %u seconds.", duration, f->nicks, f->secs)); + return MOD_RES_DENY; } } } - return 0; + return MOD_RES_PASSTHRU; } /* * XXX: HACK: We do the increment on the *POST* event here (instead of all together) because we have no way of knowing whether other modules would block a nickchange. */ - virtual void OnUserPostNick(User* user, const std::string &oldnick) + void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE { if (isdigit(user->nick[0])) /* allow switches to UID */ return; - for (UCListIter i = user->chans.begin(); i != user->chans.end(); ++i) + for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); ++i) { - Channel *channel = i->first; + Channel* channel = (*i)->chan; + ModResult res; - nickfloodsettings *f; - if (channel->GetExt("nickflood", f)) + nickfloodsettings *f = nf.ext.get(channel); + if (f) { - if (CHANOPS_EXEMPT(ServerInstance, 'F') && channel->GetStatus(user) == STATUS_OP) + res = CheckExemption::Call(exemptionprov, user, channel, "nickflood"); + if (res == MOD_RES_ALLOW) return; - + /* moved this here to avoid incrementing the counter for nick * changes that are denied for some other reason (bans, +N, etc.) * per bug #874. @@ -272,28 +199,11 @@ class ModuleNickFlood : public Module f->addnick(); } } - return; - } - - void OnChannelDelete(Channel* chan) - { - nickfloodsettings *f; - if (chan->GetExt("nickflood",f)) - { - delete f; - chan->Shrink("nickflood"); - } - } - - - virtual ~ModuleNickFlood() - { - ServerInstance->Modes->DelMode(&jf); } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Adds channel mode F (nickflood) which helps protect against spammers which mass-change nicknames.", VF_VENDOR); } };