X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nickflood.cpp;h=742f71d02cf7cd8b3bee02ac2b9a1ee153401cee;hb=fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86;hp=47c8bc8366d030eb3d741f90902230a66d851a8c;hpb=4599328e31c71958e0c3086980d1470859307b10;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp index 47c8bc836..742f71d02 100644 --- a/src/modules/m_nickflood.cpp +++ b/src/modules/m_nickflood.cpp @@ -1,47 +1,51 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2010 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * 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" -/* $ModDesc: Provides channel mode +F (nick flood protection) */ +#include "inspircd.h" /** Holds settings and state associated with channel mode +F */ class nickfloodsettings { 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(int b, int c) : secs(b), nicks(c) + nickfloodsettings(unsigned int b, unsigned int c) + : secs(b), nicks(c), unlocktime(0), counter(0) { reset = ServerInstance->Time() + secs; - counter = 0; - locked = false; - }; + } void addnick() { - counter++; if (ServerInstance->Time() > reset) { - counter = 0; + counter = 1; reset = ServerInstance->Time() + secs; } + else + counter++; } bool shouldlock() @@ -50,7 +54,7 @@ class nickfloodsettings * 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() @@ -60,30 +64,19 @@ class nickfloodsettings 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; } - }; -/** Handles channel mode +j +/** Handles channel mode +F */ class NickFlood : public ModeHandler { @@ -94,89 +87,42 @@ class NickFlood : public ModeHandler ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - nickfloodsettings *f = ext.get(channel); if (adding) { - char ndata[MAXBUF]; - char* data = ndata; - strlcpy(ndata,parameter.c_str(),MAXBUF); - char* nicks = 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++; - } - 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 (!f) - { - parameter = ConvToStr(nnicks) + ":" +ConvToStr(nsecs); - f = new nickfloodsettings(nsecs, nnicks); - ext.set(channel, 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)) - { - f = new nickfloodsettings(nsecs, nnicks); - ext.set(channel, f); - channel->SetModeParam('F', parameter); - return MODEACTION_ALLOW; - } - else - { - return MODEACTION_DENY; - } - } - } - } + source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str()); + return MODEACTION_DENY; } - else + + /* Set up the flood parameters for this channel */ + unsigned int nnicks = ConvToInt(parameter.substr(0, colon)); + unsigned int nsecs = ConvToInt(parameter.substr(colon+1)); + + if ((nnicks<1) || (nsecs<1)) { source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str()); return MODEACTION_DENY; } + + nickfloodsettings* f = ext.get(channel); + if ((f) && (nnicks == f->nicks) && (nsecs == f->secs)) + // mode params match + return MODEACTION_DENY; + + ext.set(channel, new nickfloodsettings(nsecs, nnicks)); + parameter = ConvToStr(nnicks) + ":" + ConvToStr(nsecs); + return MODEACTION_ALLOW; } else { - if (f) - { - ext.unset(channel); - channel->SetModeParam('F', ""); - return MODEACTION_ALLOW; - } + if (!channel->IsModeSet(this)) + return MODEACTION_DENY; + + ext.unset(channel); + return MODEACTION_ALLOW; } - return MODEACTION_DENY; } }; @@ -185,22 +131,21 @@ class ModuleNickFlood : public Module NickFlood nf; public: - ModuleNickFlood() : nf(this) { - if (!ServerInstance->Modes->AddMode(&nf)) - throw ModuleException("Could not add new modes!"); - ServerInstance->Extensions.Register(&nf.ext); - Implementation eventlist[] = { I_OnUserPreNick, I_OnUserPostNick }; - ServerInstance->Modules->Attach(eventlist, this, 2); } - ModResult OnUserPreNick(User* user, const std::string &newnick) + void init() CXX11_OVERRIDE { - if (ServerInstance->NICKForced.get(user)) /* Allow forced nick changes */ - return MOD_RES_PASSTHRU; + ServerInstance->Modules->AddService(nf); + ServerInstance->Modules->AddService(nf.ext); + Implementation eventlist[] = { I_OnUserPreNick, I_OnUserPostNick }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + } + ModResult OnUserPreNick(User* user, const std::string &newnick) CXX11_OVERRIDE + { for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++) { Channel *channel = *i; @@ -209,13 +154,13 @@ class ModuleNickFlood : public Module nickfloodsettings *f = nf.ext.get(channel); if (f) { - FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,channel,"nickflood")); + res = ServerInstance->OnCheckExemption(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); + user->WriteNumeric(447, "%s :%s has been locked for nickchanges for 60 seconds because there have been more than %u nick changes in %u seconds", user->nick.c_str(), channel->name.c_str(), f->nicks, f->secs); return MOD_RES_DENY; } @@ -223,7 +168,7 @@ class ModuleNickFlood : public Module { f->clear(); f->lock(); - channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName.c_str(), "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); + channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName.c_str(), "NOTICE %s :No nick changes are allowed for 60 seconds because there have been more than %u nick changes in %u seconds.", channel->name.c_str(), f->nicks, f->secs); return MOD_RES_DENY; } } @@ -235,7 +180,7 @@ class ModuleNickFlood : public Module /* * 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. */ - 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; @@ -248,10 +193,10 @@ class ModuleNickFlood : public Module nickfloodsettings *f = nf.ext.get(channel); if (f) { - FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,channel,"nickflood")); + res = ServerInstance->OnCheckExemption(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. @@ -259,14 +204,9 @@ class ModuleNickFlood : public Module f->addnick(); } } - return; - } - - ~ModuleNickFlood() - { } - Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { return Version("Channel mode F - nick flood protection", VF_VENDOR); }