X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=3241020bfb32aa358b1580c4c749176918c09769;hb=0a329440bd1d0fa642ce2f3e14bc88125377b5bd;hp=e9fc09add3ad09fb6df26c8414afd3b6e93b3a5a;hpb=aa692dc1039b63deef7886e914ec499abe7facaf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index e9fc09add..3241020bf 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013, 2016-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2016-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
@@ -24,6 +24,7 @@
 
 
 #include "inspircd.h"
+#include "modules/server.h"
 
 enum
 {
@@ -131,13 +132,24 @@ 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 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)
 	{
 	}
 
@@ -145,6 +157,16 @@ class ModuleJoinFlood : public Module
 	{
 		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
@@ -164,7 +186,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);
@@ -184,7 +206,7 @@ class ModuleJoinFlood : public Module
 
 	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);
 	}
 };