Use FindNickOnly in a few commands to prevent enumerating users via UID walking

[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 b9e9fb1461438eb90e5519075097be79efe6d4b0..e27161dac02c809e76afae2e274a041f2e8c3562 100644 (file)
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -83,7 +83,7 @@ class CommandSSLInfo : public Command
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               User* target = ServerInstance->FindNick(parameters[0]);
+               User* target = ServerInstance->FindNickOnly(parameters[0]);
 
                if (!target)
                {
@@ -130,8 +130,8 @@ class ModuleSSLInfo : public Module
 
                ServerInstance->Extensions.Register(&cmd.CertExt);
 
-               Implementation eventlist[] = { I_OnWhois, I_OnPreCommand, I_OnSetConnectClass };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               Implementation eventlist[] = { I_OnWhois, I_OnPreCommand, I_OnSetConnectClass, I_OnUserConnect };
+               ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
        Version GetVersion()
@@ -144,7 +144,7 @@ class ModuleSSLInfo : public Module
                ssl_cert* cert = cmd.CertExt.get(dest);
                if (cert)
                {
-                       ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick.c_str(), dest->nick.c_str());
+                       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())
                                ServerInstance->SendWhoisLine(source, dest, 276, "%s %s :has client certificate fingerprint %s",
@@ -199,18 +199,35 @@ class ModuleSSLInfo : public Module
                return MOD_RES_PASSTHRU;
        }
 
+       void OnUserConnect(LocalUser* user)
+       {
+               SocketCertificateRequest req(&user->eh, this);
+               if (!req.cert)
+                       return;
+               cmd.CertExt.set(user, req.cert);
+               if (req.cert->fingerprint.empty())
+                       return;
+               // find an auto-oper block for this user
+               for(OperIndex::iterator i = ServerInstance->Config->oper_blocks.begin(); i != ServerInstance->Config->oper_blocks.end(); i++)
+               {
+                       OperInfo* ifo = i->second;
+                       std::string fp = ifo->oper_block->getString("fingerprint");
+                       if (fp == req.cert->fingerprint && ifo->oper_block->getBool("autologin"))
+                               user->Oper(ifo);
+               }
+       }
+
        ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
        {
                SocketCertificateRequest req(&user->eh, this);
-               req.Send();
                bool ok = true;
-               if (myclass->config->getBool("requiressl"))
+               if (myclass->config->getString("requiressl") == "trusted")
                {
-                       ok = (req.cert != NULL);
+                       ok = (req.cert && req.cert->IsCAVerified());
                }
-               else if (myclass->config->getString("requiressl") == "trusted")
+               else if (myclass->config->getBool("requiressl"))
                {
-                       ok = (req.cert && req.cert->IsCAVerified());
+                       ok = (req.cert != NULL);
                }
 
                if (!ok)
@@ -225,11 +242,6 @@ class ModuleSSLInfo : public Module
                        UserCertificateRequest& req = static_cast<UserCertificateRequest&>(request);
                        req.cert = cmd.CertExt.get(req.user);
                }
-               else if (strcmp("SET_CERT", request.id) == 0)
-               {
-                       SSLCertSubmission& req = static_cast<SSLCertSubmission&>(request);
-                       cmd.CertExt.set(req.item, req.cert);
-               }
        }
 };