/*
* InspIRCd -- Internet Relay Chat Daemon
*
+ * Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
- * Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- * Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
+ * Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007 John Brooks <special@inspircd.org>
* Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- * Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
- * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ * Copyright (C) 2006, 2008, 2010 Craig Edwards <brain@inspircd.org>
*
* 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
#include "inspircd.h"
+#include "modules/ctctags.h"
+#include "modules/exemption.h"
/** Holds flood settings and state for mode +f
*/
unsigned int secs;
unsigned int lines;
time_t reset;
- insp::flat_map<User*, unsigned int> counters;
+ insp::flat_map<User*, double> counters;
- floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c)
+ floodsettings(bool a, unsigned int b, unsigned int c)
+ : ban(a)
+ , secs(b)
+ , lines(c)
{
reset = ServerInstance->Time() + secs;
}
- bool addmessage(User* who)
+ bool addmessage(User* who, double weight)
{
if (ServerInstance->Time() > reset)
{
reset = ServerInstance->Time() + secs;
}
- return (++counters[who] >= this->lines);
+ counters[who] += weight;
+ return (counters[who] >= this->lines);
}
void clear(User* who)
MsgFlood(Module* Creator)
: ParamMode<MsgFlood, SimpleExtItem<floodsettings> >(Creator, "flood", 'f')
{
+ syntax = "[*]<messages>:<seconds>";
}
- ModeAction OnSet(User* source, Channel* channel, std::string& parameter)
+ ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
{
std::string::size_type colon = parameter.find(':');
if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos))
{
- source->WriteNumeric(608, channel->name, "Invalid flood parameter");
+ source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
return MODEACTION_DENY;
}
/* Set up the flood parameters for this channel */
bool ban = (parameter[0] == '*');
- unsigned int nlines = ConvToInt(parameter.substr(ban ? 1 : 0, ban ? colon-1 : colon));
- unsigned int nsecs = ConvToInt(parameter.substr(colon+1));
+ unsigned int nlines = ConvToNum<unsigned int>(parameter.substr(ban ? 1 : 0, ban ? colon-1 : colon));
+ unsigned int nsecs = ConvToNum<unsigned int>(parameter.substr(colon+1));
if ((nlines<2) || (nsecs<1))
{
- source->WriteNumeric(608, channel->name, "Invalid flood parameter");
+ source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
return MODEACTION_DENY;
}
}
};
-class ModuleMsgFlood : public Module
+class ModuleMsgFlood
+ : public Module
+ , public CTCTags::EventListener
{
+private:
+ CheckExemption::EventProvider exemptionprov;
MsgFlood mf;
+ double notice;
+ double privmsg;
+ double tagmsg;
public:
-
ModuleMsgFlood()
- : mf(this)
+ : CTCTags::EventListener(this)
+ , exemptionprov(this)
+ , mf(this)
{
}
- ModResult OnUserPreMessage(User* user, void* voiddest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
+ void ReadConfig(ConfigStatus&) CXX11_OVERRIDE
{
- if (target_type != TYPE_CHANNEL)
+ ConfigTag* tag = ServerInstance->Config->ConfValue("messageflood");
+ notice = tag->getFloat("notice", 1.0);
+ privmsg = tag->getFloat("privmsg", 1.0);
+ tagmsg = tag->getFloat("tagmsg", 0.2);
+ }
+
+ ModResult HandleMessage(User* user, const MessageTarget& target, double weight)
+ {
+ if (target.type != MessageTarget::TYPE_CHANNEL)
return MOD_RES_PASSTHRU;
- Channel* dest = static_cast<Channel*>(voiddest);
+ Channel* dest = target.Get<Channel>();
if ((!IS_LOCAL(user)) || !dest->IsModeSet(mf))
return MOD_RES_PASSTHRU;
- if (ServerInstance->OnCheckExemption(user,dest,"flood") == MOD_RES_ALLOW)
+ ModResult res = CheckExemption::Call(exemptionprov, user, dest, "flood");
+ if (res == MOD_RES_ALLOW)
return MOD_RES_PASSTHRU;
floodsettings *f = mf.ext.get(dest);
if (f)
{
- if (f->addmessage(user))
+ if (f->addmessage(user, weight))
{
/* Youre outttta here! */
f->clear(user);
if (f->ban)
{
Modes::ChangeList changelist;
- changelist.push_add(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), "*!*@" + user->dhost);
+ changelist.push_add(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), "*!*@" + user->GetDisplayedHost());
ServerInstance->Modes->Process(ServerInstance->FakeClient, dest, NULL, changelist);
}
return MOD_RES_PASSTHRU;
}
- void Prioritize()
+ ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
+ {
+ return HandleMessage(user, target, (details.type == MSG_PRIVMSG ? privmsg : notice));
+ }
+
+ ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
+ {
+ return HandleMessage(user, target, tagmsg);
+ }
+
+ void Prioritize() CXX11_OVERRIDE
{
// we want to be after all modules that might deny the message (e.g. m_muteban, m_noctcp, m_blockcolor, etc.)
ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST);
Version GetVersion() CXX11_OVERRIDE
{
- return Version("Provides channel mode +f (message flood protection)", VF_VENDOR);
+ return Version("Adds channel mode f (flood) which helps protect against spammers which mass-message channels.", VF_VENDOR);
}
};
projects / user / henk / code / inspircd.git / blobdiff