ISupportManager: Tidy-up, expand comments

[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 427f3f71c46243b5dca0362a7e9b0189a94626de..8cdaa1cde0c0cad53ae194ae71af5b13edfcef13 100644 (file)
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -18,7 +18,7 @@
 
 
 #include "inspircd.h"
-#include "ssl.h"
+#include "modules/ssl.h"
 
 /* $ModDesc: Provides SSL metadata, including /WHOIS information and /SSLINFO command */
 
@@ -91,31 +91,31 @@ class CommandSSLInfo : public Command
        {
                User* target = ServerInstance->FindNickOnly(parameters[0]);
 
-               if (!target)
+               if ((!target) || (target->registered != REG_ALL))
                {
                        user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
                }
                bool operonlyfp = ServerInstance->Config->ConfValue("sslinfo")->getBool("operonly");
-               if (operonlyfp && !IS_OPER(user) && target != user)
+               if (operonlyfp && !user->IsOper() && target != user)
                {
-                       user->WriteServ("NOTICE %s :*** You cannot view SSL certificate information for other users", user->nick.c_str());
+                       user->WriteNotice("*** You cannot view SSL certificate information for other users");
                        return CMD_FAILURE;
                }
                ssl_cert* cert = CertExt.get(target);
                if (!cert)
                {
-                       user->WriteServ("NOTICE %s :*** No SSL certificate for this user", user->nick.c_str());
+                       user->WriteNotice("*** No SSL certificate for this user");
                }
                else if (cert->GetError().length())
                {
-                       user->WriteServ("NOTICE %s :*** No SSL certificate information for this user (%s).", user->nick.c_str(), cert->GetError().c_str());
+                       user->WriteNotice("*** No SSL certificate information for this user (" + cert->GetError() + ").");
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Distinguished Name: %s", user->nick.c_str(), cert->GetDN().c_str());
-                       user->WriteServ("NOTICE %s :*** Issuer:             %s", user->nick.c_str(), cert->GetIssuer().c_str());
-                       user->WriteServ("NOTICE %s :*** Key Fingerprint:    %s", user->nick.c_str(), cert->GetFingerprint().c_str());
+                       user->WriteNotice("*** Distinguished Name: " + cert->GetDN());
+                       user->WriteNotice("*** Issuer:             " + cert->GetIssuer());
+                       user->WriteNotice("*** Key Fingerprint:    " + cert->GetFingerprint());
                }
                return CMD_SUCCESS;
        }
@@ -130,49 +130,35 @@ class ModuleSSLInfo : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
 
-               ServerInstance->Extensions.Register(&cmd.CertExt);
+               ServerInstance->Modules->AddService(cmd.CertExt);
 
                Implementation eventlist[] = { I_OnWhois, I_OnPreCommand, I_OnSetConnectClass, I_OnUserConnect, I_OnPostConnect };
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("SSL Certificate Utilities", VF_VENDOR);
        }
 
-       void OnWhois(User* source, User* dest)
+       void OnWhois(User* source, User* dest) CXX11_OVERRIDE
        {
                ssl_cert* cert = cmd.CertExt.get(dest);
                if (cert)
                {
                        ServerInstance->SendWhoisLine(source, dest, 671, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str());
                        bool operonlyfp = ServerInstance->Config->ConfValue("sslinfo")->getBool("operonly");
-                       if ((!operonlyfp || source == dest || IS_OPER(source)) && !cert->fingerprint.empty())
+                       if ((!operonlyfp || source == dest || source->IsOper()) && !cert->fingerprint.empty())
                                ServerInstance->SendWhoisLine(source, dest, 276, "%s %s :has client certificate fingerprint %s",
                                        source->nick.c_str(), dest->nick.c_str(), cert->fingerprint.c_str());
                }
        }
 
-       bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
-       {
-               std::stringstream hl(hostlist);
-               std::string xhost;
-               while (hl >> xhost)
-               {
-                       if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map))
-                       {
-                               return true;
-                       }
-               }
-               return false;
-       }
-
-       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
+       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
        {
                if ((command == "OPER") && (validated))
                {
@@ -203,7 +189,7 @@ class ModuleSSLInfo : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void OnUserConnect(LocalUser* user)
+       void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
        {
                SocketCertificateRequest req(&user->eh, this);
                if (!req.cert)
@@ -211,7 +197,7 @@ class ModuleSSLInfo : public Module
                cmd.CertExt.set(user, req.cert);
        }
 
-       void OnPostConnect(User* user)
+       void OnPostConnect(User* user) CXX11_OVERRIDE
        {
                ssl_cert *cert = cmd.CertExt.get(user);
                if (!cert || cert->fingerprint.empty())
@@ -226,7 +212,7 @@ class ModuleSSLInfo : public Module
                }
        }
 
-       ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
+       ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE
        {
                SocketCertificateRequest req(&user->eh, this);
                bool ok = true;
@@ -244,7 +230,7 @@ class ModuleSSLInfo : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void OnRequest(Request& request)
+       void OnRequest(Request& request) CXX11_OVERRIDE
        {
                if (strcmp("GET_USER_CERT", request.id) == 0)
                {
@@ -255,4 +241,3 @@ class ModuleSSLInfo : public Module
 };
 
 MODULE_INIT(ModuleSSLInfo)
-