X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connflood.cpp;h=55e50a8f10c42249d6d76967d64b9bf147b4e7d4;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=04fe456275d659b9a259c91a5dc8084318c096d8;hpb=7d93921aabd9c608821baec8a871aff844dfae49;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index 04fe45627..55e50a8f1 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -1,68 +1,73 @@
-/*       +------------------------------------+
- *       | 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) 2013, 2018-2019 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) 2006-2007, 2010 Craig Edwards <brain@inspircd.org>
  *
- * 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 <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-
-/* $ModDesc: Connection throttle */
 
-int conns = 0, throttled = 0;
+#include "inspircd.h"
 
 class ModuleConnFlood : public Module
 {
-private:
-	int seconds, maxconns, timeout, boot_wait;
+	unsigned int seconds;
+	unsigned int timeout;
+	unsigned int boot_wait;
+	unsigned int conns;
+	unsigned int maxconns;
+	bool throttled;
 	time_t first;
 	std::string quitmsg;
 
-	ConfigReader* conf;
-
-
 public:
-	ModuleConnFlood(InspIRCd* Me) : Module(Me)
-	{
-
-		InitConf();
-		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
-	}
-
-	virtual ~ModuleConnFlood()
+	ModuleConnFlood()
+		: conns(0), throttled(false)
 	{
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Connection throttle", VF_VENDOR,API_VERSION);
+		return Version("Throttles IP addresses which make excessive connections to the server.", VF_VENDOR);
 	}
 
-	void InitConf()
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		/* read configuration variables */
-		conf = new ConfigReader(ServerInstance);
+		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(User* user)
+	ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
 	{
+		if (user->exempt)
+			return MOD_RES_PASSTHRU;
+
 		time_t next = ServerInstance->Time();
 
 		if ((ServerInstance->startup_time + boot_wait) > next)
@@ -74,12 +79,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;
 			}
@@ -92,7 +97,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;
@@ -105,12 +110,6 @@ public:
 		}
 		return MOD_RES_PASSTHRU;
 	}
-
-	virtual void OnRehash(User* user)
-	{
-		InitConf();
-	}
-
 };
 
 MODULE_INIT(ModuleConnFlood)