Merge branch 'insp3' into master.

6 files changed, 43 insertions, 10 deletions

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 9a7de76c0..5cc3d4ce6 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -344,11 +344,22 @@ class ModuleCgiIRC
 		// cannot match this connect class.
 		const std::string* gateway = cmd.gateway.get(user);
 		if (!gateway)
+		{
+			ServerInstance->Logs.Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires a connection via a WebIRC gateway",
+					myclass->GetName().c_str());
 			return MOD_RES_DENY;
+		}
 
 		// If the gateway matches the <connect:webirc> constraint then
 		// allow the check to continue. Otherwise, reject it.
-		return InspIRCd::Match(*gateway, webirc) ? MOD_RES_PASSTHRU : MOD_RES_DENY;
+		if (!InspIRCd::Match(*gateway, webirc))
+		{
+			ServerInstance->Logs.Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as the WebIRC gateway name (%s) does not match %s",
+					myclass->GetName().c_str(), gateway->c_str(), webirc.c_str());
+			return MOD_RES_DENY;
+		}
+
+		return MOD_RES_PASSTHRU;
 	}
 
 	ModResult OnUserRegister(LocalUser* user) override
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 57243e66b..ca8c6f10b 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -419,12 +419,20 @@ class ModuleDNSBL : public Module, public Stats::EventListener
 
 		std::string* match = nameExt.get(user);
 		if (!match)
+		{
+			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) override
diff --git a/src/modules/m_geoclass.cpp b/src/modules/m_geoclass.cpp
index 6d172440b..8076e3a09 100644
--- a/src/modules/m_geoclass.cpp
+++ b/src/modules/m_geoclass.cpp
@@ -64,6 +64,8 @@ class ModuleGeoClass
 
 		// A list of country codes were specified but the user didn't match
 		// any of them.
+		ServerInstance->Logs.Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as the origin country (%s) is not any of %s",
+			myclass->GetName().c_str(), code.c_str(), country.c_str());
 		return MOD_RES_DENY;
 	}
 
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 7710d9dfa..16dcc0145 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -406,7 +406,11 @@ class ModuleIdent : public Module
 	ModResult OnSetConnectClass(LocalUser* user, std::shared_ptr<ConnectClass> myclass) override
 	{
 		if (myclass->config->getBool("requireident") && state.get(user) != IDENT_FOUND)
+		{
+			ServerInstance->Logs.Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires an identd response",
+				myclass->GetName().c_str());
 			return MOD_RES_DENY;
+		}
 		return MOD_RES_PASSTHRU;
 	}
 
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index e105d67f5..278786aef 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -319,7 +319,11 @@ class ModuleServicesAccount
 	ModResult OnSetConnectClass(LocalUser* user, std::shared_ptr<ConnectClass> myclass) override
 	{
 		if (myclass->config->getBool("requireaccount") && !accountname.get(user))
+		{
+			ServerInstance->Logs.Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires the user to be logged into an account",
+				myclass->GetName().c_str());
 			return MOD_RES_DENY;
+		}
 		return MOD_RES_PASSTHRU;
 	}
 };
diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 566f9f786..1b175bb72 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -313,21 +313,25 @@ class ModuleSSLInfo
 	ModResult OnSetConnectClass(LocalUser* user, std::shared_ptr<ConnectClass> myclass) override
 	{
 		ssl_cert* cert = cmd.sslapi.GetCertificate(user);
-		bool ok = true;
+		const char* error = NULL;
 		const std::string requiressl = myclass->config->getString("requiressl");
 		if (stdalgo::string::equalsci(requiressl, "trusted"))
 		{
-			ok = (cert && cert->IsCAVerified());
-			ServerInstance->Logs.Log("CONNECTCLASS", LOG_DEBUG, "Class requires a trusted TLS (SSL) client certificate. Client %s one.", (ok ? "has" : "does not have"));
+			if (!cert || !cert->IsCAVerified())
+				error = "a trusted TLS (SSL) client certificate";
 		}
 		else if (myclass->config->getBool("requiressl"))
 		{
-			ok = (cert != NULL);
-			ServerInstance->Logs.Log("CONNECTCLASS", LOG_DEBUG, "Class requires a secure connection. Client %s on a secure connection.", (ok ? "is" : "is not"));
+			if (!cert)
+				error = "a TLS (SSL) connection";
 		}
 
-		if (!ok)
+		if (error)
+		{
+			ServerInstance->Logs.Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires %s",
+				myclass->GetName().c_str(), error);
 			return MOD_RES_DENY;
+		}
 
 		return MOD_RES_PASSTHRU;
 	}