X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connflood.cpp;h=1f8286e77a8a21cf31a48d8a6b246094fd85cc0a;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=d0e9257168c0ec038c5c39ff1504e42688ecc098;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index d0e925716..1f8286e77 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -1,9 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2018-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006-2007, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -21,52 +25,60 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Connection throttle */
-
-int conns = 0, throttled = 0;
-
 class ModuleConnFlood : public Module
 {
-private:
-	int seconds, maxconns, timeout, boot_wait;
+ private:
+	unsigned int seconds;
+	unsigned int timeout;
+	unsigned int boot_wait;
+	unsigned int conns;
+	unsigned int maxconns;
+	bool throttled;
 	time_t first;
 	std::string quitmsg;
 
-public:
-	ModuleConnFlood() 	{
+	static bool IsExempt(LocalUser* user)
+	{
+		// E-lined and already banned users shouldn't be hit.
+		if (user->exempt || user->quitting)
+			return true;
 
-		InitConf();
-		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		// Users in an exempt class shouldn't be hit.
+		return user->GetClass() && !user->GetClass()->config->getBool("useconnflood", true);
 	}
 
-	virtual ~ModuleConnFlood()
+public:
+	ModuleConnFlood()
+		: conns(0), throttled(false)
 	{
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Connection throttle", VF_VENDOR);
+		return Version("Throttles excessive connections to the server.", VF_VENDOR);
 	}
 
-	void InitConf()
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		/* read configuration variables */
-		ConfigReader conf;
+		ConfigTag* tag = ServerInstance->Config->ConfValue("connflood");
 		/* throttle configuration */
-		seconds = conf.ReadInteger("connflood", "seconds", 0, true);
-		maxconns = conf.ReadInteger("connflood", "maxconns", 0, true);
-		timeout = conf.ReadInteger("connflood", "timeout", 0, true);
-		quitmsg = conf.ReadValue("connflood", "quitmsg", 0);
+		seconds = tag->getDuration("period", tag->getDuration("seconds", 30));
+		maxconns = tag->getUInt("maxconns", 3);
+		timeout = tag->getDuration("timeout", 30);
+		quitmsg = tag->getString("quitmsg");
 
 		/* seconds to wait when the server just booted */
-		boot_wait = conf.ReadInteger("connflood", "bootwait", 0, true);
+		boot_wait = tag->getDuration("bootwait", 60*2);
 
 		first = ServerInstance->Time();
 	}
 
-	virtual ModResult OnUserRegister(LocalUser* user)
+	ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
 	{
+		if (IsExempt(user))
+			return MOD_RES_PASSTHRU;
+
 		time_t next = ServerInstance->Time();
 
 		if ((ServerInstance->startup_time + boot_wait) > next)
@@ -78,12 +90,12 @@ public:
 		/* increase connection count */
 		conns++;
 
-		if (throttled == 1)
+		if (throttled)
 		{
 			if (tdiff > seconds + timeout)
 			{
 				/* expire throttle */
-				throttled = 0;
+				throttled = false;
 				ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle deactivated");
 				return MOD_RES_PASSTHRU;
 			}
@@ -96,7 +108,7 @@ public:
 		{
 			if (conns >= maxconns)
 			{
-				throttled = 1;
+				throttled = true;
 				ServerInstance->SNO->WriteGlobalSno('a', "Connection throttle activated");
 				ServerInstance->Users->QuitUser(user, quitmsg);
 				return MOD_RES_DENY;
@@ -109,12 +121,6 @@ public:
 		}
 		return MOD_RES_PASSTHRU;
 	}
-
-	virtual void OnRehash(User* user)
-	{
-		InitConf();
-	}
-
 };
 
 MODULE_INIT(ModuleConnFlood)