Revert automated conversion by Special, as it (unfortunately) neglects some details...

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

diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp
index 34d9478165baffc5ee7bf1b2e0f6331a39a9ac99..817854fa82f841e016e6dc8749af23976edea3fd 100644 (file)
--- a/src/modules/extra/m_ssl_oper_cert.cpp
+++ b/src/modules/extra/m_ssl_oper_cert.cpp
@@ -31,8 +31,8 @@ class cmd_fingerprint : public Command
        {
                this->source = "m_ssl_oper_cert.so";
                syntax = "<nickname>";
-       }       
-                 
+       }
+
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                User* target = ServerInstance->FindNick(parameters[0]);
@@ -43,24 +43,24 @@ class cmd_fingerprint : public Command
                        {
                                if (cert->GetFingerprint().length())
                                {
-                                       user->WriteServ("NOTICE %s :Certificate fingerprint for %s is %s",user->nick,target->nick,cert->GetFingerprint().c_str());
+                                       user->WriteServ("NOTICE %s :Certificate fingerprint for %s is %s",user->nick.c_str(),target->nick.c_str(),cert->GetFingerprint().c_str());
                                        return CMD_SUCCESS;
                                }
                                else
                                {
-                                       user->WriteServ("NOTICE %s :Certificate fingerprint for %s does not exist!", user->nick,target->nick);
+                                       user->WriteServ("NOTICE %s :Certificate fingerprint for %s does not exist!", user->nick.c_str(),target->nick.c_str());
                                        return CMD_FAILURE;
                                }
                        }
                        else
                        {
-                               user->WriteServ("NOTICE %s :Certificate fingerprint for %s does not exist!", user->nick, target->nick);
+                               user->WriteServ("NOTICE %s :Certificate fingerprint for %s does not exist!", user->nick.c_str(), target->nick.c_str());
                                return CMD_FAILURE;
                        }
                }
                else
                {
-                       user->WriteNumeric(401, "%s %s :No such nickname", user->nick, parameters[0].c_str());
+                       user->WriteNumeric(401, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
                }
        }
@@ -104,7 +104,7 @@ class ModuleOperSSLCert : public Module
                std::string xhost;
                while (hl >> xhost)
                {
-                       if (match(host,xhost.c_str()) || match(ip,xhost.c_str(),true))
+                       if (match(host, xhost) || match(ip, xhost, true))
                        {
                                return true;
                        }
@@ -112,10 +112,10 @@ class ModuleOperSSLCert : public Module
                return false;
        }
 
-       virtual int OnPreCommand(const std::string &command, const std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+       virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
        {
                irc::string cmd = command.c_str();
-               
+
                if ((cmd == "OPER") && (validated))
                {
                        char TheHost[MAXBUF];
@@ -129,8 +129,8 @@ class ModuleOperSSLCert : public Module
                        bool SSLOnly;
                        char* dummy;
 
-                       snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host);
-                       snprintf(TheIP, MAXBUF,"%s@%s",user->ident,user->GetIPString());
+                       snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(),user->host.c_str());
+                       snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(),user->GetIPString());
 
                        HasCert = user->GetExt("ssl_cert",cert);
 
@@ -144,28 +144,38 @@ class ModuleOperSSLCert : public Module
                                FingerPrint = cf->ReadValue("oper", "fingerprint", i);
                                SSLOnly = cf->ReadFlag("oper", "sslonly", i);
 
-                               if (SSLOnly || !FingerPrint.empty())
+                               if (FingerPrint.empty() && !SSLOnly)
+                                       continue;
+
+                               if (LoginName != parameters[0])
+                                       continue;
+
+                               if (!OneOfMatches(TheHost, TheIP, HostName.c_str()))
+                                       continue;
+
+                               if (Password.length() && !ServerInstance->PassCompare(user, Password.c_str(),parameters[1].c_str(), HashType.c_str()))
+                                       continue;
+
+                               if (SSLOnly && !user->GetExt("ssl", dummy))
                                {
-                                       if ((!strcmp(LoginName.c_str(),parameters[0].c_str())) && (!ServerInstance->PassCompare(user, Password.c_str(),parameters[1].c_str(), HashType.c_str())) && (OneOfMatches(TheHost,TheIP,HostName.c_str())))
-                                       {
-                                               if (SSLOnly && !user->GetExt("ssl", dummy))
-                                               {
-                                                       user->WriteNumeric(491, "%s :This oper login name requires an SSL connection.", user->nick);
-                                                       return 1;
-                                               }
-
-                                               /* This oper would match */
-                                               if ((!cert) || (cert->GetFingerprint() != FingerPrint))
-                                               {
-                                                       user->WriteNumeric(491, "%s :This oper login name requires a matching key fingerprint.",user->nick);
-                                                       ServerInstance->SNO->WriteToSnoMask('o',"'%s' cannot oper, does not match fingerprint", user->nick);
-                                                       ServerInstance->Logs->Log("m_ssl_oper_cert",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.",user->nick,user->ident,user->host);
-                                                       return 1;
-                                               }
-                                       }
+                                       user->WriteNumeric(491, "%s :This oper login name requires an SSL connection.", user->nick.c_str());
+                                       return 1;
+                               }
+
+                               /*
+                                * No cert found or the fingerprint doesn't match
+                                */
+                               if ((!cert) || (cert->GetFingerprint() != FingerPrint))
+                               {
+                                       user->WriteNumeric(491, "%s :This oper login name requires a matching key fingerprint.",user->nick.c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('o',"'%s' cannot oper, does not match fingerprint", user->nick.c_str());
+                                       ServerInstance->Logs->Log("m_ssl_oper_cert",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
+                                       return 1;
                                }
                        }
                }
+
+               // Let core handle it for extra stuff
                return 0;
        }