Avoid doing "IP changed" event stuff on quitting users.

[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 90d1f50e20ff757e654febe0011163efc668ea95..37819c05ce0b0b5239e6e0a34d24a3fd5cf72b73 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2018-2020 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2018-2019 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2013, 2016-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2016-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013, 2015-2016 Adam <Adam@anope.org>
  *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2018 Robby <robby@chatbelgie.be>
@@ -253,17 +253,16 @@ class ModuleDNSBL : public Module, public Stats::EventListener
         */
        DNSBLConfEntry::EnumBanaction str2banaction(const std::string &action)
        {
-               if(action.compare("KILL")==0)
+               if (stdalgo::string::equalsci(action, "kill"))
                        return DNSBLConfEntry::I_KILL;
-               if(action.compare("KLINE")==0)
+               if (stdalgo::string::equalsci(action, "kline"))
                        return DNSBLConfEntry::I_KLINE;
-               if(action.compare("ZLINE")==0)
+               if (stdalgo::string::equalsci(action, "zline"))
                        return DNSBLConfEntry::I_ZLINE;
-               if(action.compare("GLINE")==0)
+               if (stdalgo::string::equalsci(action, "gline"))
                        return DNSBLConfEntry::I_GLINE;
-               if(action.compare("MARK")==0)
+               if (stdalgo::string::equalsci(action, "mark"))
                        return DNSBLConfEntry::I_MARK;
-
                return DNSBLConfEntry::I_UNKNOWN;
        }
  public:
@@ -280,6 +279,12 @@ class ModuleDNSBL : public Module, public Stats::EventListener
                ServerInstance->SNO->EnableSnomask('d', "DNSBL");
        }
 
+       void Prioritize() CXX11_OVERRIDE
+       {
+               Module* corexline = ServerInstance->Modules->Find("core_xline");
+               ServerInstance->Modules->SetPriority(this, I_OnSetUserIP, PRIORITY_AFTER, corexline);
+       }
+
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Allows the server administrator to check the IP address of connecting users against a DNSBL.", VF_VENDOR);
@@ -300,7 +305,7 @@ class ModuleDNSBL : public Module, public Stats::EventListener
                        e->name = tag->getString("name");
                        e->ident = tag->getString("ident");
                        e->host = tag->getString("host");
-                       e->reason = tag->getString("reason");
+                       e->reason = tag->getString("reason", "Your IP has been blacklisted.", 1);
                        e->domain = tag->getString("domain");
 
                        if (stdalgo::string::equalsci(tag->getString("type"), "bitmask"))
@@ -342,13 +347,6 @@ class ModuleDNSBL : public Module, public Stats::EventListener
                        }
                        else
                        {
-                               if (e->reason.empty())
-                               {
-                                       std::string location = tag->getTagLocation();
-                                       ServerInstance->SNO->WriteGlobalSno('d', "DNSBL(%s): empty reason, using defaults", location.c_str());
-                                       e->reason = "Your IP has been blacklisted.";
-                               }
-
                                /* add it, all is ok */
                                newentries.push_back(e);
                        }
@@ -359,7 +357,7 @@ class ModuleDNSBL : public Module, public Stats::EventListener
 
        void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE
        {
-               if ((user->exempt) || !DNS)
+               if (user->exempt || user->quitting || !DNS)
                        return;
 
                // Clients can't be in a DNSBL if they aren't connected via IPv4 or IPv6.
@@ -372,7 +370,10 @@ class ModuleDNSBL : public Module, public Stats::EventListener
                                return;
                }
                else
+               {
                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "User has no connect class in OnSetUserIP");
+                       return;
+               }
 
                std::string reversedip;
                if (user->client_sa.family() == AF_INET)
@@ -435,12 +436,20 @@ class ModuleDNSBL : public Module, public Stats::EventListener
 
                std::string* match = nameExt.get(user);
                if (!match)
-                       return MOD_RES_PASSTHRU;
+               {
+                       ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires a DNSBL mark",
+                                       myclass->GetName().c_str());
+                       return MOD_RES_DENY;
+               }
 
-               if (InspIRCd::Match(*match, dnsbl))
-                       return MOD_RES_PASSTHRU;
+               if (!InspIRCd::Match(*match, dnsbl))
+               {
+                       ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as the DNSBL mark (%s) does not match %s",
+                                       myclass->GetName().c_str(), match->c_str(), dnsbl.c_str());
+                       return MOD_RES_DENY;
+               }
 
-               return MOD_RES_DENY;
+               return MOD_RES_PASSTHRU;
        }
 
        ModResult OnCheckReady(LocalUser *user) CXX11_OVERRIDE