ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add an option to allow disengaging joinflood after a netsplit.

Browse Source
This commit is contained in:
Sadie Powell 2020-10-12 18:35:07 +01:00
parent 219f8e6262
commit 2a3b6ba9e2
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/conf/modules.conf.example
View File

@ -1268,8 +1268,15 @@
# Closes the channel for N seconds if X users join in Y seconds.
#<module name="joinflood">
#
# The number of seconds to close the channel for:
#<joinflood duration="1m">
# duration: The number of seconds to close a channel for when it is
# being flooded with joins.
#
# splitwait: The number of seconds to disengage joinflood for after
# a server splits. This allows users to reconnect without
# being throttled by joinflood.
#
#<joinflood duration="1m"
# splitwait="30s">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Anti auto rejoin: Adds support for prevention of auto-rejoin (+J).

24
src/modules/m_joinflood.cpp
View File

@ -24,6 +24,7 @@
#include "inspircd.h"
#include "modules/server.h"
enum
{
@ -131,13 +132,23 @@ class JoinFlood : public ParamMode<JoinFlood, SimpleExtItem<joinfloodsettings> >
}
};
class ModuleJoinFlood : public Module
class ModuleJoinFlood
: public Module
, public ServerProtocol::LinkEventListener
{
private:
JoinFlood jf;
time_t ignoreuntil;
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)
{
}
@ -145,6 +156,13 @@ class ModuleJoinFlood : public Module
{
ConfigTag* tag = ServerInstance->Config->ConfValue("joinflood");
duration = tag->getDuration("duration", 60, 10, 600);
splitwait = tag->getDuration("splitwait", 30);
}
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
@ -164,7 +182,7 @@ 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);