X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_dnsbl.cpp;h=6265ca85a88fafd3f8a49f5b9e027e5be0ebf9f3;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=7f43d7b8f55c6e997892d3c4f3c11038c0826a7d;hpb=aa692dc1039b63deef7886e914ec499abe7facaf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 7f43d7b8f..6265ca85a 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -1,9 +1,9 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018-2020 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2018-2019 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2018-2019 Matt Schatz <genius3000@g3k.solutions>
- *   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>
@@ -158,7 +158,7 @@ class DNSBLResolver : public DNS::Request
 							"*", them->GetIPString());
 					if (ServerInstance->XLines->AddLine(kl,NULL))
 					{
-						ServerInstance->SNO->WriteGlobalSno('x', "K-line added due to DNSBL match on *@%s to expire in %s (on %s): %s",
+						ServerInstance->SNO->WriteToSnoMask('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();
@@ -176,7 +176,7 @@ class DNSBLResolver : public DNS::Request
 							"*", them->GetIPString());
 					if (ServerInstance->XLines->AddLine(gl,NULL))
 					{
-						ServerInstance->SNO->WriteGlobalSno('x', "G-line added due to DNSBL match on *@%s to expire in %s (on %s): %s",
+						ServerInstance->SNO->WriteToSnoMask('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();
@@ -194,7 +194,7 @@ class DNSBLResolver : public DNS::Request
 							them->GetIPString());
 					if (ServerInstance->XLines->AddLine(zl,NULL))
 					{
-						ServerInstance->SNO->WriteGlobalSno('x', "Z-line added due to DNSBL match on %s to expire in %s (on %s): %s",
+						ServerInstance->SNO->WriteToSnoMask('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();
@@ -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:
@@ -282,7 +281,7 @@ class ModuleDNSBL : public Module, public Stats::EventListener
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides handling of DNS blacklists", VF_VENDOR);
+		return Version("Allows the server administrator to check the IP address of connecting users against a DNSBL.", VF_VENDOR);
 	}
 
 	/** Fill our conf vector with data
@@ -300,7 +299,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 +341,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);
 			}
@@ -435,12 +427,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