-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007, 2009 Robin Burchell <robin+git@viroteck.net>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-#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 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()
{
- return (counter >= this->nicks);
+ /* 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 ((ServerInstance->Time() <= reset) && (counter == this->nicks));
}
void clear()
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
{
public:
- NickFlood(InspIRCd* Instance) : ModeHandler(Instance, 'F', 1, 0, false, MODETYPE_CHANNEL, false) { }
+ SimpleExtItem<nickfloodsettings> ext;
+ NickFlood(Module* Creator) : ModeHandler(Creator, "nickflood", 'F', PARAM_SETONLY, MODETYPE_CHANNEL),
+ ext("nickflood", 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)
{
- 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);
- }
-
- 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)
- {
- nickfloodsettings* dummy;
-
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++;
+ source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
+ return MODEACTION_DENY;
}
- 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->SetMode('F', true);
- channel->SetModeParam('F', parameter.c_str(), true);
- 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', cur_param.c_str(), false);
- channel->SetModeParam('F', parameter.c_str(), true);
- return MODEACTION_ALLOW;
- }
- else
- {
- 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 (channel->GetExt("nickflood", dummy))
- {
- nickfloodsettings *f;
- channel->GetExt("nickflood", f);
- delete f;
- channel->Shrink("nickflood");
- channel->SetMode('F', false);
- return MODEACTION_ALLOW;
- }
+ if (!channel->IsModeSet(this))
+ return MODEACTION_DENY;
+
+ ext.unset(channel);
+ return MODEACTION_ALLOW;
}
- return MODEACTION_DENY;
}
};
class ModuleNickFlood : public Module
{
- NickFlood* jf;
+ NickFlood nf;
public:
-
- ModuleNickFlood(InspIRCd* Me)
- : Module(Me)
+ ModuleNickFlood()
+ : nf(this)
{
-
- jf = new NickFlood(ServerInstance);
- if (!ServerInstance->Modes->AddMode(jf))
- throw ModuleException("Could not add new modes!");
- Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreNick };
- ServerInstance->Modules->Attach(eventlist, this, 2);
}
- virtual int OnUserPreNick(User* user, const std::string &newnick)
+ ModResult OnUserPreNick(User* user, const std::string &newnick) CXX11_OVERRIDE
{
- if (isdigit(newnick[0])) /* allow switches to UID */
- return 0;
-
for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
{
- Channel *channel = i->first;
+ Channel *channel = *i;
+ 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 = 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);
- return 1;
+ 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;
}
- f->addnick();
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->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;
}
}
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
- void OnChannelDelete(Channel* chan)
+ /*
+ * 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) CXX11_OVERRIDE
{
- nickfloodsettings *f;
- if (chan->GetExt("nickflood",f))
- {
- delete f;
- chan->Shrink("nickflood");
- }
- }
+ if (isdigit(user->nick[0])) /* allow switches to UID */
+ return;
+ for (UCListIter i = user->chans.begin(); i != user->chans.end(); ++i)
+ {
+ Channel *channel = *i;
+ ModResult res;
- virtual ~ModuleNickFlood()
- {
- ServerInstance->Modes->DelMode(jf);
- delete jf;
+ nickfloodsettings *f = nf.ext.get(channel);
+ if (f)
+ {
+ 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.
+ */
+ f->addnick();
+ }
+ }
}
- virtual Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("Channel mode F - nick flood protection", VF_VENDOR);
}
};
projects / user / henk / code / inspircd.git / blobdiff