X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=c5c872169ea1a2b360ff24d60a240e756a790b05;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=f2082da3338c27a23a7c12ecf729aaece1fde295;hpb=2dfc384cde46ba63ed7c2f4420712596096123ca;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index f2082da33..c5c872169 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -1,296 +1,164 @@ -/* +------------------------------------+ - * | 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) 2009 Daniel De Graaf + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2007 John Brooks + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * 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 (message flood protection) */ +#include "inspircd.h" /** Holds flood settings and state for mode +f */ -class floodsettings : public classbase +class floodsettings { - private: - InspIRCd *ServerInstance; public: bool ban; - int secs; - int lines; + unsigned int secs; + unsigned int lines; time_t reset; - std::map counters; + insp::flat_map counters; - floodsettings(InspIRCd *Instance, bool a, int b, int c) : ServerInstance(Instance), ban(a), secs(b), lines(c) + floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c) { reset = ServerInstance->Time() + secs; - }; + } - void addmessage(User* who) + bool addmessage(User* who) { - std::map::iterator iter = counters.find(who); - if (iter != counters.end()) - { - iter->second++; - } - else - { - counters[who] = 1; - } if (ServerInstance->Time() > reset) { counters.clear(); reset = ServerInstance->Time() + secs; } - } - bool shouldkick(User* who) - { - std::map::iterator iter = counters.find(who); - if (iter != counters.end()) - { - return (iter->second >= this->lines); - } - else return false; + return (++counters[who] >= this->lines); } void clear(User* who) { - std::map::iterator iter = counters.find(who); - if (iter != counters.end()) - { - counters.erase(iter); - } + counters.erase(who); } }; /** Handles channel mode +f */ -class MsgFlood : public ModeHandler +class MsgFlood : public ParamMode > { public: - MsgFlood(InspIRCd* Instance) : ModeHandler(Instance, 'f', 1, 0, false, MODETYPE_CHANNEL, false) { } - - ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + MsgFlood(Module* Creator) + : ParamMode >(Creator, "flood", 'f') { - floodsettings* x; - if (channel->GetExt("flood",x)) - return std::make_pair(true, (x->ban ? "*" : "")+ConvToStr(x->lines)+":"+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) + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) { - /* 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) - { - floodsettings *f; - - 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* lines = data; - char* secs = NULL; - bool ban = false; - if (*data == '*') - { - ban = true; - lines++; - } - else - { - ban = false; - } - while (*data) - { - if (*data == ':') - { - *data = 0; - data++; - secs = data; - break; - } - else data++; - } - if (secs) - { - /* Set up the flood parameters for this channel */ - int nlines = atoi(lines); - int nsecs = atoi(secs); - if ((nlines<2) || (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("flood", f)) - { - parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs); - floodsettings *fs = new floodsettings(ServerInstance,ban,nsecs,nlines); - channel->Extend("flood",fs); - channel->SetMode('f', parameter); - return MODEACTION_ALLOW; - } - else - { - std::string cur_param = channel->GetModeParameter('f'); - parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs); - if (cur_param == parameter) - { - // mode params match - return MODEACTION_DENY; - } - else - { - if ((((nlines != f->lines) || (nsecs != f->secs) || (ban != f->ban))) && (((nsecs > 0) && (nlines > 0)))) - { - delete f; - floodsettings *fs = new floodsettings(ServerInstance,ban,nsecs,nlines); - channel->Shrink("flood"); - channel->Extend("flood",fs); - channel->SetMode('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()); - parameter.clear(); - return MODEACTION_DENY; - } + source->WriteNumeric(608, channel->name, "Invalid flood parameter"); + return MODEACTION_DENY; } - else + + /* 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)); + + if ((nlines<2) || (nsecs<1)) { - if (channel->GetExt("flood", f)) - { - delete f; - channel->Shrink("flood"); - channel->SetMode('f', ""); - return MODEACTION_ALLOW; - } + source->WriteNumeric(608, channel->name, "Invalid flood parameter"); + return MODEACTION_DENY; } - return MODEACTION_DENY; + ext.set(channel, new floodsettings(ban, nsecs, nlines)); + return MODEACTION_ALLOW; + } + + void SerializeParam(Channel* chan, const floodsettings* fs, std::string& out) + { + if (fs->ban) + out.push_back('*'); + out.append(ConvToStr(fs->lines)).push_back(':'); + out.append(ConvToStr(fs->secs)); } }; class ModuleMsgFlood : public Module { - - MsgFlood* mf; + MsgFlood mf; public: - ModuleMsgFlood(InspIRCd* Me) - : Module(Me) + ModuleMsgFlood() + : mf(this) { - - mf = new MsgFlood(ServerInstance); - if (!ServerInstance->Modes->AddMode(mf)) - throw ModuleException("Could not add new modes!"); - Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreNotice, I_OnUserPreMessage }; - ServerInstance->Modules->Attach(eventlist, this, 3); } - int ProcessMessages(User* user,Channel* dest, const std::string &text) + ModResult OnUserPreMessage(User* user, void* voiddest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE { - if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)) - { - return 0; - } + if (target_type != TYPE_CHANNEL) + return MOD_RES_PASSTHRU; + + Channel* dest = static_cast(voiddest); + if ((!IS_LOCAL(user)) || !dest->IsModeSet(mf)) + return MOD_RES_PASSTHRU; - floodsettings *f; - if (dest->GetExt("flood", f)) + if (ServerInstance->OnCheckExemption(user,dest,"flood") == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; + + floodsettings *f = mf.ext.get(dest); + if (f) { - f->addmessage(user); - if (f->shouldkick(user)) + if (f->addmessage(user)) { /* Youre outttta here! */ f->clear(user); if (f->ban) { - std::vector parameters; - parameters.push_back(dest->name); - parameters.push_back("+b"); - parameters.push_back(user->MakeWildHost()); - ServerInstance->SendMode(parameters, ServerInstance->FakeClient); - - ServerInstance->PI->SendModeStr(dest->name, std::string("+b ") + user->MakeWildHost()); + Modes::ChangeList changelist; + changelist.push_add(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), "*!*@" + user->dhost); + ServerInstance->Modes->Process(ServerInstance->FakeClient, dest, NULL, changelist); } - char kickmessage[MAXBUF]; - snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs); + const std::string kickMessage = "Channel flood triggered (limit is " + ConvToStr(f->lines) + + " in " + ConvToStr(f->secs) + " secs)"; - if (!dest->ServerKickUser(user, kickmessage, true)) - { - delete dest; - } + dest->KickUser(ServerInstance->FakeClient, user, kickMessage); - return 1; + return MOD_RES_DENY; } } - return 0; - } - - virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list) - { - if (target_type == TYPE_CHANNEL) - return ProcessMessages(user,(Channel*)dest,text); - - return 0; - } - - virtual int OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list) - { - if (target_type == TYPE_CHANNEL) - return ProcessMessages(user,(Channel*)dest,text); - - return 0; - } - - void OnChannelDelete(Channel* chan) - { - floodsettings* f; - if (chan->GetExt("flood", f)) - { - delete f; - chan->Shrink("flood"); - } + return MOD_RES_PASSTHRU; } - - virtual ~ModuleMsgFlood() + void Prioritize() { - ServerInstance->Modes->DelMode(mf); - delete mf; + // 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); } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Provides channel mode +f (message flood protection)", VF_VENDOR); } };