X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=28b12a0860ad29f5e324ac3782195ca483655c4c;hb=7ba36f5348a6cca1c0da820c60ae17063f3cdad5;hp=81ad7e1692de7560c2abe8f225debe3f9be107a7;hpb=6c7a3ceb6c674a9af09da955ee0238e9291cf29a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index 81ad7e169..28b12a086 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -1,11 +1,13 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2013, 2016-2019 Sadie Powell + * Copyright (C) 2012-2014 Attila Molnar + * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2007 Robin Burchell - * Copyright (C) 2006-2007 Craig Edwards - * Copyright (C) 2006 Oliver Lupton + * Copyright (C) 2006-2007, 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 @@ -22,6 +24,16 @@ #include "inspircd.h" +#include "modules/server.h" + +enum +{ + // From RFC 2182. + ERR_UNAVAILRESOURCE = 437 +}; + +// The number of seconds the channel will be closed for. +static unsigned int duration; /** Holds settings and state associated with channel mode +j */ @@ -71,7 +83,7 @@ class joinfloodsettings void lock() { - unlocktime = ServerInstance->Time() + 60; + unlocktime = ServerInstance->Time() + duration; } bool operator==(const joinfloodsettings& other) const @@ -82,67 +94,79 @@ class joinfloodsettings /** Handles channel mode +j */ -class JoinFlood : public ModeHandler +class JoinFlood : public ParamMode > { public: - SimpleExtItem ext; - JoinFlood(Module* Creator) : ModeHandler(Creator, "joinflood", 'j', PARAM_SETONLY, MODETYPE_CHANNEL), - ext("joinflood", Creator) { } + JoinFlood(Module* Creator) + : ParamMode >(Creator, "joinflood", 'j') + { + syntax = ":"; + } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE { - if (adding) + std::string::size_type colon = parameter.find(':'); + if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos)) { - std::string::size_type colon = parameter.find(':'); - if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos)) - { - source->WriteNumeric(608, "%s :Invalid flood parameter",channel->name.c_str()); - return MODEACTION_DENY; - } - - /* Set up the flood parameters for this channel */ - unsigned int njoins = ConvToInt(parameter.substr(0, colon)); - unsigned int nsecs = ConvToInt(parameter.substr(colon+1)); - if ((njoins<1) || (nsecs<1)) - { - source->WriteNumeric(608, "%s :Invalid flood parameter",channel->name.c_str()); - return MODEACTION_DENY; - } - - joinfloodsettings jfs(nsecs, njoins); - joinfloodsettings* f = ext.get(channel); - if ((f) && (*f == jfs)) - // mode params match - return MODEACTION_DENY; - - ext.set(channel, jfs); - parameter = ConvToStr(njoins) + ":" + ConvToStr(nsecs); - return MODEACTION_ALLOW; + source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter)); + return MODEACTION_DENY; } - else - { - if (!channel->IsModeSet(this)) - return MODEACTION_DENY; - joinfloodsettings* f = ext.get(channel); - if (f) - { - ext.unset(channel); - return MODEACTION_ALLOW; - } + /* Set up the flood parameters for this channel */ + unsigned int njoins = ConvToNum(parameter.substr(0, colon)); + unsigned int nsecs = ConvToNum(parameter.substr(colon+1)); + if ((njoins<1) || (nsecs<1)) + { + source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter)); + return MODEACTION_DENY; } - return MODEACTION_DENY; + + ext.set(channel, new joinfloodsettings(nsecs, njoins)); + return MODEACTION_ALLOW; + } + + void SerializeParam(Channel* chan, const joinfloodsettings* jfs, std::string& out) + { + out.append(ConvToStr(jfs->joins)).push_back(':'); + out.append(ConvToStr(jfs->secs)); } }; -class ModuleJoinFlood : public Module +class ModuleJoinFlood + : public Module + , public ServerProtocol::LinkEventListener { + private: JoinFlood jf; + time_t ignoreuntil; + unsigned long bootwait; + unsigned long splitwait; public: + // Stop GCC warnings about the deprecated OnServerSplit event. + using ServerProtocol::LinkEventListener::OnServerSplit; + ModuleJoinFlood() - : jf(this) + : ServerProtocol::LinkEventListener(this) + , jf(this) + , ignoreuntil(0) + { + } + + void ReadConfig(ConfigStatus&) CXX11_OVERRIDE + { + ConfigTag* tag = ServerInstance->Config->ConfValue("joinflood"); + duration = tag->getDuration("duration", 60, 10, 600); + bootwait = tag->getDuration("bootwait", 30); + splitwait = tag->getDuration("splitwait", 30); + + ignoreuntil = ServerInstance->startup_time + bootwait; + } + + void OnServerSplit(const Server* server, bool error) CXX11_OVERRIDE { + if (splitwait) + ignoreuntil = ServerInstance->Time() + splitwait; } ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE @@ -152,7 +176,7 @@ class ModuleJoinFlood : public Module joinfloodsettings *f = jf.ext.get(chan); if (f && f->islocked()) { - user->WriteNumeric(609, "%s :This channel is temporarily unavailable (+j). Please try again later.",chan->name.c_str()); + user->WriteNumeric(ERR_UNAVAILRESOURCE, chan->name, "This channel is temporarily unavailable (+j is set). Please try again later."); return MOD_RES_DENY; } } @@ -162,27 +186,27 @@ class ModuleJoinFlood : public Module void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE { /* We arent interested in JOIN events caused by a network burst */ - if (sync) + if (sync || ignoreuntil > ServerInstance->Time()) return; joinfloodsettings *f = jf.ext.get(memb->chan); /* But all others are OK */ - if (f) + if ((f) && (!f->islocked())) { f->addjoin(); if (f->shouldlock()) { f->clear(); f->lock(); - memb->chan->WriteChannelWithServ((char*)ServerInstance->Config->ServerName.c_str(), "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", memb->chan->name.c_str(), f->joins, f->secs); + memb->chan->WriteNotice(InspIRCd::Format("This channel has been closed to new users for %u seconds because there have been more than %d joins in %d seconds.", duration, f->joins, f->secs)); } } } Version GetVersion() CXX11_OVERRIDE { - return Version("Provides channel mode +j (join flood protection)", VF_VENDOR); + return Version("Adds channel mode j (joinflood) which helps protect against spammers which mass-join channels.", VF_VENDOR); } };