X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=329d77aac69ffc594c81a038faac2188ae294ff1;hb=96befc58f073b4f96771b57d728b16742294c2fe;hp=46df977a5dc79b91464401a8b81ad0f273b5e395;hpb=81027f3a0888ac4c8e3fb6ea90081492defce946;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index 46df977a5..329d77aac 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -1,13 +1,14 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2013, 2017-2019 Sadie Powell + * Copyright (C) 2012-2014, 2016 Attila Molnar + * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2008 Pippijn van Steenhoven - * Copyright (C) 2007 Robin Burchell - * Copyright (C) 2007 John Brooks + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 John Brooks * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006 Craig Edwards - * Copyright (C) 2006 Oliver Lupton + * Copyright (C) 2006, 2008, 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 @@ -24,6 +25,7 @@ #include "inspircd.h" +#include "modules/ctctags.h" #include "modules/exemption.h" /** Holds flood settings and state for mode +f @@ -35,14 +37,17 @@ class floodsettings unsigned int secs; unsigned int lines; time_t reset; - insp::flat_map counters; + insp::flat_map 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) { @@ -50,7 +55,8 @@ class floodsettings reset = ServerInstance->Time() + secs; } - return (++counters[who] >= this->lines); + counters[who] += weight; + return (counters[who] >= this->lines); } void clear(User* who) @@ -67,25 +73,26 @@ class MsgFlood : public ParamMode > MsgFlood(Module* Creator) : ParamMode >(Creator, "flood", 'f') { + syntax = "[*]:"; } - 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(parameter.substr(ban ? 1 : 0, ban ? colon-1 : colon)); + unsigned int nsecs = ConvToNum(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; } @@ -102,44 +109,57 @@ class MsgFlood : public ParamMode > } }; -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() - : exemptionprov(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(voiddest); + Channel* dest = target.Get(); if ((!IS_LOCAL(user)) || !dest->IsModeSet(mf)) return MOD_RES_PASSTHRU; - ModResult res; - FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, dest, "flood")); + 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); } @@ -155,7 +175,17 @@ class ModuleMsgFlood : public Module 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); @@ -163,7 +193,7 @@ class ModuleMsgFlood : public Module 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); } };