Merge pull request #1018 from SaberUK/insp20+hidekills

[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 8c39ae8ba0a2fab6bb519db29f6ab1361053016b..26120add984381529a736bcd3af0f8b67b4e0d61 100644 (file)
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -1,96 +1,127 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * 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"
 #include "xline.h"
 
-/* $ModDesc: Throttles the connections of any users who try connect flood */
+/* $ModDesc: Throttles the connections of IP ranges who try to connect flood. */
 
-class ModuleQuitBan : public Module
+class ModuleConnectBan : public Module
 {
  private:
        clonemap connects;
        unsigned int threshold;
        unsigned int banduration;
+       unsigned int ipv4_cidr;
+       unsigned int ipv6_cidr;
  public:
-       ModuleQuitBan(InspIRCd* Me) : Module(Me)
+       void init()
        {
-               Implementation eventlist[] = { I_OnUserConnect, I_OnGarbageCollect, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
-               OnRehash(NULL, "");
+               Implementation eventlist[] = { I_OnSetUserIP, I_OnGarbageCollect, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+               OnRehash(NULL);
        }
 
-       virtual ~ModuleQuitBan()
+       virtual ~ModuleConnectBan()
        {
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+               return Version("Throttles the connections of IP ranges who try to connect flood.", VF_VENDOR);
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
-               ConfigReader Conf(ServerInstance);
-               std::string duration;
+               ConfigTag* tag = ServerInstance->Config->ConfValue("connectban");
+
+               ipv4_cidr = tag->getInt("ipv4cidr", 32);
+               if (ipv4_cidr == 0)
+                       ipv4_cidr = 32;
 
-               threshold = Conf.ReadInteger("connectban", "threshold", 0, true);
+               ipv6_cidr = tag->getInt("ipv6cidr", 128);
+               if (ipv6_cidr == 0)
+                       ipv6_cidr = 128;
 
+               threshold = tag->getInt("threshold", 10);
                if (threshold == 0)
                        threshold = 10;
 
-               duration = Conf.ReadValue("connectban", "duration", 0, true);
-
-               if (duration.empty())
-                       duration = "10m";
-
-               banduration = ServerInstance->Duration(duration);
+               banduration = ServerInstance->Duration(tag->getString("duration", "10m"));
+               if (banduration == 0)
+                       banduration = 10*60;
        }
 
-       virtual void OnUserConnect(User *u)
+       virtual void OnSetUserIP(LocalUser* u)
        {
-               clonemap::iterator i = connects.find(u->GetIPString());
+               if (u->exempt)
+                       return;
+
+               int range = 32;
+               clonemap::iterator i;
+
+               switch (u->client_sa.sa.sa_family)
+               {
+                       case AF_INET6:
+                               range = ipv6_cidr;
+                       break;
+                       case AF_INET:
+                               range = ipv4_cidr;
+                       break;
+               }
+
+               irc::sockets::cidr_mask mask(u->client_sa, range);
+               i = connects.find(mask);
 
                if (i != connects.end())
                {
                        i->second++;
-                       ServerInstance->Logs->Log("m_connectban",DEBUG, "Count for IP is now %d", i->second);
 
                        if (i->second >= threshold)
                        {
                                // Create zline for set duration.
-                               ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, "Connect flooding", u->GetIPString());
-                               if (ServerInstance->XLines->AddLine(zl,NULL))
-                                       ServerInstance->XLines->ApplyLines();
-                               else
+                               ZLine* zl = new ZLine(ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, "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.", mask.str());
+                               if (!ServerInstance->XLines->AddLine(zl, NULL))
+                               {
                                        delete zl;
-
-                               ServerInstance->SNO->WriteToSnoMask('x', "Connect flooding from IP %s (%d)", u->GetIPString(), threshold);
+                                       return;
+                               }
+                               ServerInstance->XLines->ApplyLines();
+                               std::string maskstr = mask.str();
+                               std::string timestr = ServerInstance->TimeString(zl->expiry);
+                               ServerInstance->SNO->WriteGlobalSno('x',"Module m_connectban added Z:line on *@%s to expire on %s: Connect flooding",
+                                       maskstr.c_str(), timestr.c_str());
+                               ServerInstance->SNO->WriteGlobalSno('a', "Connect flooding from IP range %s (%d)", maskstr.c_str(), threshold);
                                connects.erase(i);
                        }
                }
                else
                {
-                       connects[u->GetIPString()] = 1;
-                       ServerInstance->Logs->Log("m_quitban",DEBUG, "Added new record");
+                       connects[mask] = 1;
                }
        }
 
        virtual void OnGarbageCollect()
        {
-               ServerInstance->Logs->Log("m_quitban",DEBUG, "Clearing map.");
+               ServerInstance->Logs->Log("m_connectban",DEBUG, "Clearing map.");
                connects.clear();
        }
 };
 
-MODULE_INIT(ModuleQuitBan)
+MODULE_INIT(ModuleConnectBan)