]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_dnsbl.cpp
Add ConfigTag::getDuration() with optional bounds checking
[user/henk/code/inspircd.git] / src / modules / m_dnsbl.cpp
index 5d32a0adb7cd060366a15b0ecd62478fcb7d8b23..becc7a6e85d59762b01886b1d0c544d8386d1d4a 100644 (file)
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006-2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 John Brooks <john.brooks@dereferenced.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"
-#include "dns.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
-#ifndef WINDOWS
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
-
-/* $ModDesc: Provides handling of DNS blacklists */
+#include "modules/dns.h"
 
 /* Class holding data for a single entry */
 class DNSBLConfEntry
 {
        public:
-               enum EnumBanaction { I_UNKNOWN, I_KILL, I_ZLINE, I_KLINE, I_GLINE };
-               std::string name, domain, reason;
+               enum EnumBanaction { I_UNKNOWN, I_KILL, I_ZLINE, I_KLINE, I_GLINE, I_MARK };
+               enum EnumType { A_RECORD, A_BITMASK };
+               std::string name, ident, host, domain, reason;
                EnumBanaction banaction;
+               EnumType type;
                long duration;
                int bitmask;
+               unsigned char records[256];
                unsigned long stats_hits, stats_misses;
-               DNSBLConfEntry(): duration(86400),bitmask(0),stats_hits(0), stats_misses(0) {}
-               ~DNSBLConfEntry() { }
+               DNSBLConfEntry(): type(A_BITMASK),duration(86400),bitmask(0),stats_hits(0), stats_misses(0) {}
 };
 
 
 /** Resolver for CGI:IRC hostnames encoded in ident/GECOS
  */
-class DNSBLResolver : public Resolver
+class DNSBLResolver : public DNS::Request
 {
-       int theirfd;
-       userrec* them;
+       std::string theiruid;
+       LocalStringExt& nameExt;
+       LocalIntExt& countExt;
        DNSBLConfEntry *ConfEntry;
 
  public:
 
-       DNSBLResolver(Module *me, InspIRCd *ServerInstance, const std::string &hostname, userrec* u, int userfd, DNSBLConfEntry *conf, bool &cached)
-               : Resolver(ServerInstance, hostname, DNS_QUERY_A, cached, me)
+       DNSBLResolver(DNS::Manager *mgr, Module *me, LocalStringExt& match, LocalIntExt& ctr, const std::string &hostname, LocalUser* u, DNSBLConfEntry *conf)
+               : DNS::Request(mgr, me, hostname, DNS::QUERY_A, true), theiruid(u->uuid), nameExt(match), countExt(ctr), ConfEntry(conf)
        {
-               theirfd = userfd;
-               them = u;
-               ConfEntry = conf;
        }
 
-       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
+       /* Note: This may be called multiple times for multiple A record results */
+       void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE
        {
                /* Check the user still exists */
-               if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
-               {
-                       // Now we calculate the bitmask: 256*(256*(256*a+b)+c)+d
-                       if(result.length())
-                       {
-                               unsigned int bitmask = 0;
-                               bool show = false;
-                               in_addr resultip;
+               LocalUser* them = (LocalUser*)ServerInstance->FindUUID(theiruid);
+               if (!them)
+                       return;
 
-                               /* Convert the result to an in_addr (we can gaurantee we got ipv4)
-                                * Whoever did the loop that was here before, I AM CONFISCATING
-                                * YOUR CRACKPIPE. you know who you are. -- Brain
-                                */
-                               inet_aton(result.c_str(), &resultip);
-                               bitmask = resultip.s_addr >> 24; /* Last octet (network byte order */
+               const DNS::ResourceRecord &ans_record = r->answers[0];
 
+               int i = countExt.get(them);
+               if (i)
+                       countExt.set(them, i - 1);
+
+               // Now we calculate the bitmask: 256*(256*(256*a+b)+c)+d
+
+               unsigned int bitmask = 0, record = 0;
+               bool match = false;
+               in_addr resultip;
+
+               inet_aton(ans_record.rdata.c_str(), &resultip);
+
+               switch (ConfEntry->type)
+               {
+                       case DNSBLConfEntry::A_BITMASK:
+                               bitmask = resultip.s_addr >> 24; /* Last octet (network byte order) */
                                bitmask &= ConfEntry->bitmask;
+                               match = (bitmask != 0);
+                       break;
+                       case DNSBLConfEntry::A_RECORD:
+                               record = resultip.s_addr >> 24; /* Last octet */
+                               match = (ConfEntry->records[record] == 1);
+                       break;
+               }
+
+               if (match)
+               {
+                       std::string reason = ConfEntry->reason;
+                       std::string::size_type x = reason.find("%ip%");
+                       while (x != std::string::npos)
+                       {
+                               reason.erase(x, 4);
+                               reason.insert(x, them->GetIPString());
+                               x = reason.find("%ip%");
+                       }
+
+                       ConfEntry->stats_hits++;
 
-                               if (bitmask != 0)
+                       switch (ConfEntry->banaction)
+                       {
+                               case DNSBLConfEntry::I_KILL:
+                               {
+                                       ServerInstance->Users->QuitUser(them, "Killed (" + reason + ")");
+                                       break;
+                               }
+                               case DNSBLConfEntry::I_MARK:
                                {
-                                       std::string reason = ConfEntry->reason;
-                                       std::string::size_type x = reason.find("%ip%");
-                                       while (x != std::string::npos)
+                                       if (!ConfEntry->ident.empty())
                                        {
-                                               reason.erase(x, 4);
-                                               reason.insert(x, them->GetIPString());
-                                               x = reason.find("%ip%");
+                                               them->WriteServ("304 " + them->nick + " :Your ident has been set to " + ConfEntry->ident + " because you matched " + reason);
+                                               them->ChangeIdent(ConfEntry->ident);
                                        }
 
-                                       ConfEntry->stats_hits++;
-
-                                       switch (ConfEntry->banaction)
+                                       if (!ConfEntry->host.empty())
                                        {
-                                               case DNSBLConfEntry::I_KILL:
-                                               {
-                                                       userrec::QuitUser(ServerInstance, them, std::string("Killed (") + reason + ")");
-                                                       break;
-                                               }
-                                               case DNSBLConfEntry::I_KLINE:
-                                               {
-                                                       std::string ban = std::string("*@") + them->GetIPString();
-                                                       if (show)
-                                                               ServerInstance->XLines->apply_lines(APPLY_KLINES);                                                              
-                                                       show = ServerInstance->XLines->add_kline(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), ban.c_str());
-                                                       FOREACH_MOD(I_OnAddKLine,OnAddKLine(ConfEntry->duration, NULL, reason, ban));
-                                                       break;
-                                               }
-                                               case DNSBLConfEntry::I_GLINE:
-                                               {
-                                                       std::string ban = std::string("*@") + them->GetIPString();
-                                                       show = ServerInstance->XLines->add_gline(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), ban.c_str());
-                                                       if (show)
-                                                               ServerInstance->XLines->apply_lines(APPLY_GLINES);
-                                                       FOREACH_MOD(I_OnAddGLine,OnAddGLine(ConfEntry->duration, NULL, reason, ban));
-                                                       break;
-                                               }
-                                               case DNSBLConfEntry::I_ZLINE:
-                                               {
-                                                       show = ServerInstance->XLines->add_zline(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), them->GetIPString());
-                                                       if (show)
-                                                               ServerInstance->XLines->apply_lines(APPLY_ZLINES);
-                                                       FOREACH_MOD(I_OnAddZLine,OnAddZLine(ConfEntry->duration, NULL, reason, them->GetIPString()));
-                                                       break;
-                                               }
-                                               case DNSBLConfEntry::I_UNKNOWN:
-                                               {
-                                                       break;
-                                               }
-                                               break;
+                                               them->WriteServ("304 " + them->nick + " :Your host has been set to " + ConfEntry->host + " because you matched " + reason);
+                                               them->ChangeDisplayedHost(ConfEntry->host);
                                        }
 
-                                       if (show)
+                                       nameExt.set(them, ConfEntry->name);
+                                       break;
+                               }
+                               case DNSBLConfEntry::I_KLINE:
+                               {
+                                       KLine* kl = new KLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(),
+                                                       "*", them->GetIPString());
+                                       if (ServerInstance->XLines->AddLine(kl,NULL))
+                                       {
+                                               std::string timestr = ServerInstance->TimeString(kl->expiry);
+                                               ServerInstance->SNO->WriteGlobalSno('x',"K:line added due to DNSBL match on *@%s to expire on %s: %s",
+                                                       them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
+                                               ServerInstance->XLines->ApplyLines();
+                                       }
+                                       else
+                                               delete kl;
+                                       break;
+                               }
+                               case DNSBLConfEntry::I_GLINE:
+                               {
+                                       GLine* gl = new GLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(),
+                                                       "*", them->GetIPString());
+                                       if (ServerInstance->XLines->AddLine(gl,NULL))
                                        {
-                                               ServerInstance->WriteOpers("*** Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost(), ConfEntry->name.c_str(), bitmask);
+                                               std::string timestr = ServerInstance->TimeString(gl->expiry);
+                                               ServerInstance->SNO->WriteGlobalSno('x',"G:line added due to DNSBL match on *@%s to expire on %s: %s",
+                                                       them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
+                                               ServerInstance->XLines->ApplyLines();
                                        }
+                                       else
+                                               delete gl;
+                                       break;
                                }
-                               else
-                                       ConfEntry->stats_misses++;
+                               case DNSBLConfEntry::I_ZLINE:
+                               {
+                                       ZLine* zl = new ZLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(),
+                                                       them->GetIPString());
+                                       if (ServerInstance->XLines->AddLine(zl,NULL))
+                                       {
+                                               std::string timestr = ServerInstance->TimeString(zl->expiry);
+                                               ServerInstance->SNO->WriteGlobalSno('x',"Z:line added due to DNSBL match on *@%s to expire on %s: %s",
+                                                       them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
+                                               ServerInstance->XLines->ApplyLines();
+                                       }
+                                       else
+                                               delete zl;
+                                       break;
+                               }
+                               case DNSBLConfEntry::I_UNKNOWN:
+                               default:
+                                       break;
                        }
-                       else
-                               ConfEntry->stats_misses++;
+
+                       ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s%s detected as being on a DNS blacklist (%s) with result %d", them->nick.empty() ? "<unknown>" : "", them->GetFullRealHost().c_str(), ConfEntry->domain.c_str(), (ConfEntry->type==DNSBLConfEntry::A_BITMASK) ? bitmask : record);
                }
+               else
+                       ConfEntry->stats_misses++;
        }
 
-       virtual void OnError(ResolverError e, const std::string &errormessage)
+       void OnError(const DNS::Query *q) CXX11_OVERRIDE
        {
-       }
+               LocalUser* them = (LocalUser*)ServerInstance->FindUUID(theiruid);
+               if (!them)
+                       return;
 
-       virtual ~DNSBLResolver()
-       {
+               int i = countExt.get(them);
+               if (i)
+                       countExt.set(them, i - 1);
+
+               if (q->error == DNS::ERROR_NO_RECORDS || q->error == DNS::ERROR_DOMAIN_NOT_FOUND)
+                       ConfEntry->stats_misses++;
        }
 };
 
 class ModuleDNSBL : public Module
 {
- private:
        std::vector<DNSBLConfEntry *> DNSBLConfEntries;
+       dynamic_reference<DNS::Manager> DNS;
+       LocalStringExt nameExt;
+       LocalIntExt countExt;
 
        /*
         *      Convert a string to EnumBanaction
@@ -174,35 +221,35 @@ class ModuleDNSBL : public Module
                        return DNSBLConfEntry::I_ZLINE;
                if(action.compare("GLINE")==0)
                        return DNSBLConfEntry::I_GLINE;
+               if(action.compare("MARK")==0)
+                       return DNSBLConfEntry::I_MARK;
 
                return DNSBLConfEntry::I_UNKNOWN;
        }
  public:
-       ModuleDNSBL(InspIRCd *Me) : Module(Me)
+       ModuleDNSBL() : DNS(this, "DNS"), nameExt("dnsbl_match", this), countExt("dnsbl_pending", this) { }
+
+       void init() CXX11_OVERRIDE
        {
                ReadConf();
+               ServerInstance->Modules->AddService(nameExt);
+               ServerInstance->Modules->AddService(countExt);
        }
 
-       virtual ~ModuleDNSBL()
+       ~ModuleDNSBL()
        {
                ClearEntries();
        }
 
-       virtual Version GetVersion()
-       {
-               return Version(2, 0, 0, 1, VF_VENDOR, API_VERSION);
-       }
-
-       void Implements(char* List)
+       Version GetVersion() CXX11_OVERRIDE
        {
-               List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnStats] = 1;
+               return Version("Provides handling of DNS blacklists", VF_VENDOR);
        }
 
        /** Clear entries and free the mem it was using
         */
        void ClearEntries()
        {
-               std::vector<DNSBLConfEntry *>::iterator i;
                for (std::vector<DNSBLConfEntry *>::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++)
                        delete *i;
                DNSBLConfEntries.clear();
@@ -210,44 +257,69 @@ class ModuleDNSBL : public Module
 
        /** Fill our conf vector with data
         */
-       virtual void ReadConf()
+       void ReadConf()
        {
-               ConfigReader *MyConf = new ConfigReader(ServerInstance);
                ClearEntries();
 
-               for (int i=0; i< MyConf->Enumerate("dnsbl"); i++)
+               ConfigTagList dnsbls = ServerInstance->Config->ConfTags("dnsbl");
+               for(ConfigIter i = dnsbls.first; i != dnsbls.second; ++i)
                {
+                       ConfigTag* tag = i->second;
                        DNSBLConfEntry *e = new DNSBLConfEntry();
 
-                       e->name = MyConf->ReadValue("dnsbl", "name", i);
-                       e->reason = MyConf->ReadValue("dnsbl", "reason", i);
-                       e->domain = MyConf->ReadValue("dnsbl", "domain", i);
-                       e->banaction = str2banaction(MyConf->ReadValue("dnsbl", "action", i));
-                       e->duration = ServerInstance->Duration(MyConf->ReadValue("dnsbl", "duration", i));
-                       e->bitmask = MyConf->ReadInteger("dnsbl", "bitmask", i, false);
+                       e->name = tag->getString("name");
+                       e->ident = tag->getString("ident");
+                       e->host = tag->getString("host");
+                       e->reason = tag->getString("reason");
+                       e->domain = tag->getString("domain");
+
+                       if (tag->getString("type") == "bitmask")
+                       {
+                               e->type = DNSBLConfEntry::A_BITMASK;
+                               e->bitmask = tag->getInt("bitmask");
+                       }
+                       else
+                       {
+                               memset(e->records, 0, sizeof(e->records));
+                               e->type = DNSBLConfEntry::A_RECORD;
+                               irc::portparser portrange(tag->getString("records"), false);
+                               long item = -1;
+                               while ((item = portrange.GetToken()))
+                                       e->records[item] = 1;
+                       }
+
+                       e->banaction = str2banaction(tag->getString("action"));
+                       e->duration = tag->getDuration("duration", 60, 1);
+
+                       /* Use portparser for record replies */
 
                        /* yeah, logic here is a little messy */
-                       if (e->bitmask <= 0)
+                       if ((e->bitmask <= 0) && (DNSBLConfEntry::A_BITMASK == e->type))
                        {
-                               ServerInstance->WriteOpers("*** DNSBL(#%d): invalid bitmask",i);
+                               std::string location = tag->getTagLocation();
+                               ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): invalid bitmask", location.c_str());
                        }
-                       else if (e->name == "")
+                       else if (e->name.empty())
                        {
-                               ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid name",i);
+                               std::string location = tag->getTagLocation();
+                               ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): Invalid name", location.c_str());
                        }
-                       else if (e->domain == "")
+                       else if (e->domain.empty())
                        {
-                               ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid domain",i);
+                               std::string location = tag->getTagLocation();
+                               ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): Invalid domain", location.c_str());
                        }
                        else if (e->banaction == DNSBLConfEntry::I_UNKNOWN)
                        {
-                               ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid banaction", i);
+                               std::string location = tag->getTagLocation();
+                               ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): Invalid banaction", location.c_str());
                        }
                        else
                        {
-                               if (e->reason == "")
+                               if (e->reason.empty())
                                {
-                                       ServerInstance->WriteOpers("*** DNSBL(#%d): empty reason, using defaults",i);
+                                       std::string location = tag->getTagLocation();
+                                       ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): empty reason, using defaults", location.c_str());
                                        e->reason = "Your IP has been blacklisted.";
                                }
 
@@ -259,119 +331,99 @@ class ModuleDNSBL : public Module
                        /* delete and drop it, error somewhere */
                        delete e;
                }
-
-               delete MyConf;
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
                ReadConf();
        }
 
-       virtual int OnUserRegister(userrec* user)
+       void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE
        {
-               /* only do lookups on local users */
-               if (IS_LOCAL(user))
+               if ((user->exempt) || (user->client_sa.sa.sa_family != AF_INET) || !DNS)
+                       return;
+
+               if (user->MyClass)
                {
-                       /* following code taken from bopm, reverses an IP address. */
-                       struct in_addr in;
-                       unsigned char a, b, c, d;
-                       char reversedipbuf[128];
-                       std::string reversedip;
-                       bool success = false;
-
-                       if (!inet_aton(user->GetIPString(), &in))
-                       {
-#ifdef IPV6
-                               /* We could have an ipv6 address here */
-                               std::string x = user->GetIPString();
-                               /* Is it a 4in6 address? (Compensate for this kernel kludge that people love) */
-                               if (x.find("0::ffff:") == 0)
-                               {
-                                       x.erase(x.begin(), x.begin() + 8);
-                                       if (inet_aton(x.c_str(), &in))
-                                               success = true;
-                               }
-#endif
-                       }
-                       else
-                       {
-                               success = true;
-                       }
+                       if (!user->MyClass->config->getBool("usednsbl", true))
+                               return;
+               }
+               else
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "User has no connect class in OnSetUserIP");
 
-                       if (!success)
-                               return 0;
+               unsigned int a, b, c, d;
+               d = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 24) & 0xFF;
+               c = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 16) & 0xFF;
+               b = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 8) & 0xFF;
+               a = (unsigned int) user->client_sa.in4.sin_addr.s_addr & 0xFF;
 
-                       d = (unsigned char) (in.s_addr >> 24) & 0xFF;
-                       c = (unsigned char) (in.s_addr >> 16) & 0xFF;
-                       b = (unsigned char) (in.s_addr >> 8) & 0xFF;
-                       a = (unsigned char) in.s_addr & 0xFF;
+               const std::string reversedip = ConvToStr(d) + "." + ConvToStr(c) + "." + ConvToStr(b) + "." + ConvToStr(a);
 
-                       snprintf(reversedipbuf, 128, "%d.%d.%d.%d", d, c, b, a);
-                       reversedip = std::string(reversedipbuf);
+               countExt.set(user, DNSBLConfEntries.size());
 
-                       // For each DNSBL, we will run through this lookup
-                       for (std::vector<DNSBLConfEntry *>::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++)
-                       {
-                               // Fill hostname with a dnsbl style host (d.c.b.a.domain.tld)
-                               std::string hostname = reversedip + "." + (*i)->domain;
+               // For each DNSBL, we will run through this lookup
+               for (unsigned i = 0; i < DNSBLConfEntries.size(); ++i)
+               {
+                       // Fill hostname with a dnsbl style host (d.c.b.a.domain.tld)
+                       std::string hostname = reversedip + "." + DNSBLConfEntries[i]->domain;
 
-                               /* now we'd need to fire off lookups for `hostname'. */
-                               bool cached;
-                               DNSBLResolver *r = new DNSBLResolver(this, ServerInstance, hostname, user, user->GetFd(), *i, cached);
-                               ServerInstance->AddResolver(r, cached);
+                       /* now we'd need to fire off lookups for `hostname'. */
+                       DNSBLResolver *r = new DNSBLResolver(*this->DNS, this, nameExt, countExt, hostname, user, DNSBLConfEntries[i]);
+                       try
+                       {
+                               this->DNS->Process(r);
+                       }
+                       catch (DNS::Exception &ex)
+                       {
+                               delete r;
+                               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, std::string(ex.GetReason()));
                        }
+
+                       if (user->quitting)
+                               break;
                }
+       }
 
-               /* don't do anything with this hot potato */
-               return 0;
+       ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE
+       {
+               std::string dnsbl;
+               if (!myclass->config->readString("dnsbl", dnsbl))
+                       return MOD_RES_PASSTHRU;
+               std::string* match = nameExt.get(user);
+               std::string myname = match ? *match : "";
+               if (dnsbl == myname)
+                       return MOD_RES_PASSTHRU;
+               return MOD_RES_DENY;
+       }
+
+       ModResult OnCheckReady(LocalUser *user) CXX11_OVERRIDE
+       {
+               if (countExt.get(user))
+                       return MOD_RES_DENY;
+               return MOD_RES_PASSTHRU;
        }
-       
-       virtual int OnStats(char symbol, userrec* user, string_list &results)
+
+       ModResult OnStats(char symbol, User* user, string_list &results) CXX11_OVERRIDE
        {
                if (symbol != 'd')
-                       return 0;
-               
+                       return MOD_RES_PASSTHRU;
+
                unsigned long total_hits = 0, total_misses = 0;
 
                for (std::vector<DNSBLConfEntry*>::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++)
                {
                        total_hits += (*i)->stats_hits;
                        total_misses += (*i)->stats_misses;
-                       
-                       results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS DNSbl \"" + (*i)->name + "\" had " +
+
+                       results.push_back(ServerInstance->Config->ServerName + " 304 " + user->nick + " :DNSBLSTATS DNSbl \"" + (*i)->name + "\" had " +
                                        ConvToStr((*i)->stats_hits) + " hits and " + ConvToStr((*i)->stats_misses) + " misses");
                }
-               
-               results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS Total hits: " + ConvToStr(total_hits));
-               results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS Total misses: " + ConvToStr(total_misses));
-               
-               return 0;
-       }
-};
 
-// stuff down here is the module-factory stuff.
+               results.push_back(ServerInstance->Config->ServerName + " 304 " + user->nick + " :DNSBLSTATS Total hits: " + ConvToStr(total_hits));
+               results.push_back(ServerInstance->Config->ServerName + " 304 " + user->nick + " :DNSBLSTATS Total misses: " + ConvToStr(total_misses));
 
-class ModuleDNSBLFactory : public ModuleFactory
-{
- public:
-       ModuleDNSBLFactory()
-       {
-       }
-
-       ~ModuleDNSBLFactory()
-       {
-       }
-
-       virtual Module *CreateModule(InspIRCd *Me)
-       {
-               return new ModuleDNSBL(Me);
+               return MOD_RES_PASSTHRU;
        }
-
 };
 
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleDNSBLFactory;
-}
+MODULE_INIT(ModuleDNSBL)