The rest of the server protocol interface and fix a warning in m_rline

[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 38dbb8f2027e706c06f3622b237d169a4862552b..e06d746b7aeb38c4000508eb3b2bf9d4f1d92c57 100644 (file)
--- a/src/modules/extra/m_ssl_oper_cert.cpp
+++ b/src/modules/extra/m_ssl_oper_cert.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -33,7 +33,7 @@ class cmd_fingerprint : public Command
                syntax = "<nickname>";
        }       
                  
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
                User* target = ServerInstance->FindNick(parameters[0]);
                if (target)
@@ -60,7 +60,7 @@ class cmd_fingerprint : public Command
                }
                else
                {
-                       user->WriteServ("401 %s %s :No such nickname", user->nick, parameters[0]);
+                       user->WriteNumeric(401, "%s %s :No such nickname", user->nick, parameters[0]);
                        return CMD_FAILURE;
                }
        }
@@ -82,6 +82,8 @@ class ModuleOperSSLCert : public Module
                mycommand = new cmd_fingerprint(ServerInstance);
                ServerInstance->AddCommand(mycommand);
                cf = new ConfigReader(ServerInstance);
+               Implementation eventlist[] = { I_OnPreCommand, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        virtual ~ModuleOperSSLCert()
@@ -89,10 +91,6 @@ class ModuleOperSSLCert : public Module
                delete cf;
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnPreCommand] = List[I_OnRehash] = 1;
-       }
 
        virtual void OnRehash(User* user, const std::string &parameter)
        {
@@ -114,8 +112,7 @@ class ModuleOperSSLCert : public Module
                return false;
        }
 
-
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
        {
                irc::string cmd = command.c_str();
                
@@ -127,6 +124,7 @@ class ModuleOperSSLCert : public Module
                        std::string Password;
                        std::string OperType;
                        std::string HostName;
+                       std::string HashType;
                        std::string FingerPrint;
                        bool SSLOnly;
                        char* dummy;
@@ -142,25 +140,26 @@ class ModuleOperSSLCert : public Module
                                Password = cf->ReadValue("oper", "password", i);
                                OperType = cf->ReadValue("oper", "type", i);
                                HostName = cf->ReadValue("oper", "host", i);
+                               HashType = cf->ReadValue("oper", "hash", i);
                                FingerPrint = cf->ReadValue("oper", "fingerprint", i);
                                SSLOnly = cf->ReadFlag("oper", "sslonly", i);
 
                                if (SSLOnly || !FingerPrint.empty())
                                {
-                                       if ((!strcmp(LoginName.c_str(),parameters[0])) && (!ServerInstance->OperPassCompare(Password.c_str(),parameters[1],i)) && (OneOfMatches(TheHost,TheIP,HostName.c_str())))
+                                       if ((!strcmp(LoginName.c_str(),parameters[0])) && (!ServerInstance->PassCompare(user, Password.c_str(),parameters[1], HashType.c_str())) && (OneOfMatches(TheHost,TheIP,HostName.c_str())))
                                        {
                                                if (SSLOnly && !user->GetExt("ssl", dummy))
                                                {
-                                                       user->WriteServ("491 %s :This oper login name requires an SSL connection.", user->nick);
+                                                       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->WriteServ("491 %s :This oper login name requires a matching key fingerprint.",user->nick);
+                                                       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->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.",user->nick,user->ident,user->host);
+                                                       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;
                                                }
                                        }
@@ -172,7 +171,7 @@ class ModuleOperSSLCert : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,0,VF_VENDOR,API_VERSION);
        }
 };