Opt-out of pgsql read and write events if polling fails.

[user/henk/code/inspircd.git] / src / modules / m_connectban.cpp

diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index 12b1234980f8e007db4013a08c6e450c6970d381..bb3fcbc461e0aaf76a27688deb13f1299ff7a27e 100644 (file)
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -1,6 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2014 Googolplexed <googol@googolplexed.net>
+ *   Copyright (C) 2013, 2017-2019 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-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -19,8 +26,11 @@
 
 #include "inspircd.h"
 #include "xline.h"
+#include "modules/webirc.h"
 
-class ModuleConnectBan : public Module
+class ModuleConnectBan
+       : public Module
+       , public WebIRC::EventListener
 {
        typedef std::map<irc::sockets::cidr_mask, unsigned int> ConnectMap;
        ConnectMap connects;
@@ -52,9 +62,14 @@ class ModuleConnectBan : public Module
        }
 
  public:
+       ModuleConnectBan()
+               : WebIRC::EventListener(this)
+       {
+       }
+
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Throttles the connections of IP ranges who try to connect flood", VF_VENDOR);
+               return Version("Z-lines IP addresses which make excessive connections to the server.", VF_VENDOR);
        }
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
@@ -68,6 +83,20 @@ class ModuleConnectBan : public Module
                banmessage = tag->getString("banmessage", "Your IP range has been attempting to connect too many times in too short a duration. Wait a while, and you will be able to connect.");
        }
 
+       void OnWebIRCAuth(LocalUser* user, const WebIRC::FlagMap* flags) CXX11_OVERRIDE
+       {
+               if (user->exempt)
+                       return;
+
+               // HACK: Lower the connection attempts for the gateway IP address. The user
+               // will be rechecked for connect spamming shortly after when their IP address
+               // is changed and OnSetUserIP is called.
+               irc::sockets::cidr_mask mask(user->client_sa, GetRange(user));
+               ConnectMap::iterator iter = connects.find(mask);
+               if (iter != connects.end() && iter->second)
+                       iter->second--;
+       }
+
        void OnSetUserIP(LocalUser* u) CXX11_OVERRIDE
        {
                if (u->exempt)