Only assign NewServices once the duplicate check is done.

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

diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 477785bea62d8b1f01963a944cb296f86485741b..0054e3ed7d46ec4e91aff47a311adad2dcf65de8 100644 (file)
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -1,9 +1,9 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
- *   Copyright (C) 2013 Christopher 'm4z' Holm <them4z@gmail.com>
+ *   Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2010 Adam <Adam@anope.org>
@@ -176,11 +176,12 @@ class CommandSSLInfo : public Command
                ssl_cert* cert = sslapi.GetCertificate(target);
                if (!cert)
                {
-                       user->WriteNotice("*** No TLS (SSL) client certificate for this user");
+                       user->WriteNotice(InspIRCd::Format("*** %s is not connected using TLS (SSL).", target->nick.c_str()));
                }
                else if (cert->GetError().length())
                {
-                       user->WriteNotice("*** No TLS (SSL) client certificate information for this user (" + cert->GetError() + ").");
+                       user->WriteNotice(InspIRCd::Format("*** %s is connected using TLS (SSL) but has not specified a valid client certificate (%s).",
+                               target->nick.c_str(), cert->GetError().c_str()));
                }
                else
                {
@@ -317,21 +318,25 @@ class ModuleSSLInfo
        ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_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;
        }