Fix DNSBL lookups for IPv6.

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

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 838c2c5c6a6d6981b1ccef5c8d69c0de14d5242e..9a9ad85a296351d492e259b6055165efbbfd1ef6 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -147,9 +147,9 @@ class DNSBLResolver : public DNS::Request
                                                        "*", them->GetIPString());
                                        if (ServerInstance->XLines->AddLine(kl,NULL))
                                        {
-                                               std::string timestr = InspIRCd::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->SNO->WriteGlobalSno('x', "K-line added due to DNSBL match on *@%s to expire in %s (on %s): %s",
+                                                       them->GetIPString().c_str(), InspIRCd::DurationString(kl->duration).c_str(),
+                                                       InspIRCd::TimeString(kl->expiry).c_str(), reason.c_str());
                                                ServerInstance->XLines->ApplyLines();
                                        }
                                        else
@@ -165,9 +165,9 @@ class DNSBLResolver : public DNS::Request
                                                        "*", them->GetIPString());
                                        if (ServerInstance->XLines->AddLine(gl,NULL))
                                        {
-                                               std::string timestr = InspIRCd::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->SNO->WriteGlobalSno('x', "G-line added due to DNSBL match on *@%s to expire in %s (on %s): %s",
+                                                       them->GetIPString().c_str(), InspIRCd::DurationString(gl->duration).c_str(),
+                                                       InspIRCd::TimeString(gl->expiry).c_str(), reason.c_str());
                                                ServerInstance->XLines->ApplyLines();
                                        }
                                        else
@@ -183,9 +183,9 @@ class DNSBLResolver : public DNS::Request
                                                        them->GetIPString());
                                        if (ServerInstance->XLines->AddLine(zl,NULL))
                                        {
-                                               std::string timestr = InspIRCd::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->SNO->WriteGlobalSno('x', "Z-line added due to DNSBL match on %s to expire in %s (on %s): %s",
+                                                       them->GetIPString().c_str(), InspIRCd::DurationString(zl->duration).c_str(),
+                                                       InspIRCd::TimeString(zl->expiry).c_str(), reason.c_str());
                                                ServerInstance->XLines->ApplyLines();
                                        }
                                        else
@@ -218,16 +218,21 @@ class DNSBLResolver : public DNS::Request
                        countExt.set(them, i - 1);
 
                if (q->error == DNS::ERROR_NO_RECORDS || q->error == DNS::ERROR_DOMAIN_NOT_FOUND)
+               {
                        ConfEntry->stats_misses++;
+                       return;
+               }
 
                ServerInstance->SNO->WriteGlobalSno('d', "An error occurred whilst checking whether %s (%s) is on the '%s' DNS blacklist: %s",
                        them->GetFullRealHost().c_str(), them->GetIPString().c_str(), ConfEntry->name.c_str(), this->manager->GetErrorStr(q->error).c_str());
        }
 };
 
+typedef std::vector<reference<DNSBLConfEntry> > DNSBLConfList;
+
 class ModuleDNSBL : public Module, public Stats::EventListener
 {
-       std::vector<reference<DNSBLConfEntry> > DNSBLConfEntries;
+       DNSBLConfList DNSBLConfEntries;
        dynamic_reference<DNS::Manager> DNS;
        LocalStringExt nameExt;
        LocalIntExt countExt;
@@ -273,7 +278,7 @@ class ModuleDNSBL : public Module, public Stats::EventListener
         */
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               DNSBLConfEntries.clear();
+               DNSBLConfList newentries;
 
                ConfigTagList dnsbls = ServerInstance->Config->ConfTags("dnsbl");
                for(ConfigIter i = dnsbls.first; i != dnsbls.second; ++i)
@@ -310,23 +315,19 @@ class ModuleDNSBL : public Module, public Stats::EventListener
                        /* yeah, logic here is a little messy */
                        if ((e->bitmask <= 0) && (DNSBLConfEntry::A_BITMASK == e->type))
                        {
-                               std::string location = tag->getTagLocation();
-                               ServerInstance->SNO->WriteGlobalSno('d', "DNSBL(%s): invalid bitmask", location.c_str());
+                               throw ModuleException("Invalid <dnsbl:bitmask> at " + tag->getTagLocation());
                        }
                        else if (e->name.empty())
                        {
-                               std::string location = tag->getTagLocation();
-                               ServerInstance->SNO->WriteGlobalSno('d', "DNSBL(%s): Invalid name", location.c_str());
+                               throw ModuleException("Empty <dnsbl:name> at " + tag->getTagLocation());
                        }
                        else if (e->domain.empty())
                        {
-                               std::string location = tag->getTagLocation();
-                               ServerInstance->SNO->WriteGlobalSno('d', "DNSBL(%s): Invalid domain", location.c_str());
+                               throw ModuleException("Empty <dnsbl:domain> at " + tag->getTagLocation());
                        }
                        else if (e->banaction == DNSBLConfEntry::I_UNKNOWN)
                        {
-                               std::string location = tag->getTagLocation();
-                               ServerInstance->SNO->WriteGlobalSno('d', "DNSBL(%s): Invalid banaction", location.c_str());
+                               throw ModuleException("Unknown <dnsbl:action> at " + tag->getTagLocation());
                        }
                        else
                        {
@@ -338,9 +339,11 @@ class ModuleDNSBL : public Module, public Stats::EventListener
                                }
 
                                /* add it, all is ok */
-                               DNSBLConfEntries.push_back(e);
+                               newentries.push_back(e);
                        }
                }
+
+               DNSBLConfEntries.swap(newentries);
        }
 
        void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE
@@ -381,6 +384,7 @@ class ModuleDNSBL : public Module, public Stats::EventListener
                                reversedip.push_back(*it);
                                reversedip.push_back('.');
                        }
+                       reversedip.erase(reversedip.length() - 1, 1);
                }
                else
                        return;
@@ -417,10 +421,14 @@ class ModuleDNSBL : public Module, public Stats::EventListener
                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)
+               if (!match)
+                       return MOD_RES_PASSTHRU;
+
+               if (InspIRCd::Match(*match, dnsbl))
                        return MOD_RES_PASSTHRU;
+
                return MOD_RES_DENY;
        }