Improve X-line text consistency.

[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 4ef4df6f691b4f69be5e433fec43ef0af9742c68..a645e2cd16b47d91bb54460cb24db2dce2d2aa5a 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -148,7 +148,7 @@ class DNSBLResolver : public DNS::Request
                                        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",
+                                               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();
                                        }
@@ -166,7 +166,7 @@ class DNSBLResolver : public DNS::Request
                                        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",
+                                               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();
                                        }
@@ -184,7 +184,7 @@ class DNSBLResolver : public DNS::Request
                                        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",
+                                               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();
                                        }
@@ -200,8 +200,8 @@ class DNSBLResolver : public DNS::Request
                                        break;
                        }
 
-                       ServerInstance->SNO->WriteGlobalSno('d', "Connecting user %s detected as being on a DNS blacklist (%s) with result %d",
-                               them->GetFullRealHost().c_str(), ConfEntry->domain.c_str(), (ConfEntry->type==DNSBLConfEntry::A_BITMASK) ? bitmask : record);
+                       ServerInstance->SNO->WriteGlobalSno('d', "Connecting user %s (%s) detected as being on the '%s' DNS blacklist with result %d",
+                               them->GetFullRealHost().c_str(), them->GetIPString().c_str(), ConfEntry->name.c_str(), (ConfEntry->type==DNSBLConfEntry::A_BITMASK) ? bitmask : record);
                }
                else
                        ConfEntry->stats_misses++;
@@ -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