m_connectban Don't depend on the definition of clonemap

[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 f831a3b77b1ba50873c374efe77a065f29d8d1ed..fcb4b09ed8dcb9c2a69473808458801007fd35ac 100644 (file)
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -20,62 +20,39 @@
 #include "inspircd.h"
 #include "xline.h"
 
-/* $ModDesc: Throttles the connections of any users who try connect flood */
-
 class ModuleConnectBan : public Module
 {
- private:
-       clonemap connects;
+       typedef std::map<irc::sockets::cidr_mask, unsigned int> ConnectMap;
+       ConnectMap connects;
        unsigned int threshold;
        unsigned int banduration;
        unsigned int ipv4_cidr;
        unsigned int ipv6_cidr;
- public:
-       ModuleConnectBan()      {
-               Implementation eventlist[] = { I_OnUserConnect, I_OnGarbageCollect, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
-               OnRehash(NULL);
-       }
-
-       virtual ~ModuleConnectBan()
-       {
-       }
+       std::string banmessage;
 
-       virtual Version GetVersion()
+ public:
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Throttles the connections of any users who try connect flood", VF_VENDOR);
+               return Version("Throttles the connections of IP ranges who try to connect flood.", VF_VENDOR);
        }
 
-       virtual void OnRehash(User* user)
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               ConfigReader Conf;
-               std::string duration;
-
-               ipv4_cidr = Conf.ReadInteger("connectban", "ipv4cidr", 0, true);
-               if (ipv4_cidr == 0)
-                       ipv4_cidr = 32;
+               ConfigTag* tag = ServerInstance->Config->ConfValue("connectban");
 
-               ipv6_cidr = Conf.ReadInteger("connectban", "ipv6cidr", 0, true);
-               if (ipv6_cidr == 0)
-                       ipv6_cidr = 128;
-
-               threshold = Conf.ReadInteger("connectban", "threshold", 0, true);
-
-               if (threshold == 0)
-                       threshold = 10;
-
-               duration = Conf.ReadValue("connectban", "duration", 0, true);
-
-               if (duration.empty())
-                       duration = "10m";
-
-               banduration = ServerInstance->Duration(duration);
+               ipv4_cidr = tag->getInt("ipv4cidr", 32, 1, 32);
+               ipv6_cidr = tag->getInt("ipv6cidr", 128, 1, 128);
+               threshold = tag->getInt("threshold", 10, 1);
+               banduration = tag->getDuration("duration", 10*60, 1);
+               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.");
        }
 
-       virtual void OnUserConnect(LocalUser *u)
+       void OnSetUserIP(LocalUser* u) CXX11_OVERRIDE
        {
+               if (u->exempt)
+                       return;
+
                int range = 32;
-               clonemap::iterator i;
 
                switch (u->client_sa.sa.sa_family)
                {
@@ -88,7 +65,7 @@ class ModuleConnectBan : public Module
                }
 
                irc::sockets::cidr_mask mask(u->client_sa, range);
-               i = connects.find(mask);
+               ConnectMap::iterator i = connects.find(mask);
 
                if (i != connects.end())
                {
@@ -97,15 +74,18 @@ class ModuleConnectBan : public Module
                        if (i->second >= threshold)
                        {
                                // Create zline for set duration.
-                               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))
-                                       ServerInstance->XLines->ApplyLines();
-                               else
+                               ZLine* zl = new ZLine(ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, banmessage, mask.str());
+                               if (!ServerInstance->XLines->AddLine(zl, NULL))
+                               {
                                        delete zl;
-
-                               ServerInstance->SNO->WriteGlobalSno('x',"Module m_connectban added Z:line on *@%s to expire on %s: Connect flooding", 
-                                       mask.str().c_str(), ServerInstance->TimeString(zl->expiry).c_str());
-                               ServerInstance->SNO->WriteGlobalSno('a', "Connect flooding from IP range %s (%d)", mask.str().c_str(), threshold);
+                                       return;
+                               }
+                               ServerInstance->XLines->ApplyLines();
+                               std::string maskstr = mask.str();
+                               std::string timestr = InspIRCd::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);
                        }
                }
@@ -115,9 +95,9 @@ class ModuleConnectBan : public Module
                }
        }
 
-       virtual void OnGarbageCollect()
+       void OnGarbageCollect()
        {
-               ServerInstance->Logs->Log("m_connectban",DEBUG, "Clearing map.");
+               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Clearing map.");
                connects.clear();
        }
 };