Change the SQLutils and SQL providers to also use interfaces for proper unload order...

[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 0d1ab045c3a0c38e7645643e19deb79c434e8a59..0c13d5e6dedfe84d09f7a254661a2ab9ea77e8c1 100644 (file)
--- a/src/modules/extra/m_ssl_oper_cert.cpp
+++ b/src/modules/extra/m_ssl_oper_cert.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -15,8 +12,7 @@
  */
 
 /* $ModDesc: Allows for MD5 encrypted oper passwords */
-
-using namespace std;
+/* $ModDep: transport.h */
 
 #include <stdio.h>
 #include "inspircd_config.h"
@@ -24,8 +20,11 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "inspircd.h"
-#include "ssl_cert.h"
+#include "transport.h"
+#include "wildcard.h"
 
+/** Handle /FINGERPRINT
+ */
 class cmd_fingerprint : public command_t
 {
  public:
@@ -35,7 +34,7 @@ class cmd_fingerprint : public command_t
                syntax = "<nickname>";
        }       
                  
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                userrec* target = ServerInstance->FindNick(parameters[0]);
                if (target)
@@ -44,23 +43,32 @@ class cmd_fingerprint : public command_t
                        if (target->GetExt("ssl_cert",cert))
                        {
                                if (cert->GetFingerprint().length())
+                               {
                                        user->WriteServ("NOTICE %s :Certificate fingerprint for %s is %s",user->nick,target->nick,cert->GetFingerprint().c_str());
+                                       return CMD_SUCCESS;
+                               }
                                else
+                               {
                                        user->WriteServ("NOTICE %s :Certificate fingerprint for %s does not exist!", user->nick,target->nick);
+                                       return CMD_FAILURE;
+                               }
                        }
                        else
                        {
                                user->WriteServ("NOTICE %s :Certificate fingerprint for %s does not exist!", user->nick, target->nick);
+                               return CMD_FAILURE;
                        }
                }
                else
                {
                        user->WriteServ("401 %s %s :No such nickname", user->nick, parameters[0]);
+                       return CMD_FAILURE;
                }
        }
 };
 
 
+
 class ModuleOperSSLCert : public Module
 {
        ssl_cert* cert;
@@ -82,48 +90,74 @@ class ModuleOperSSLCert : public Module
 
        void Implements(char* List)
        {
-               List[I_OnOperCompare] = List[I_OnPreCommand] = 1;
+               List[I_OnPreCommand] = 1;
        }
 
-       virtual int OnOperCompare(const std::string &data, const std::string &input)
+
+       bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
        {
-               ServerInstance->Log(DEBUG,"HasCert=%d, data='%s' input='%s'",HasCert,data.c_str(), input.c_str());
-               if (((data.length()) && (data.length() == cert->GetFingerprint().length())))
+               std::stringstream hl(hostlist);
+               std::string xhost;
+               while (hl >> xhost)
                {
-                       ServerInstance->Log(DEBUG,"Lengths match, cert='%s'",cert->GetFingerprint().c_str());
-                       if (data == cert->GetFingerprint())
-                       {
-                               ServerInstance->Log(DEBUG,"Return 1");
-                               return 1;
-                       }
-                       else
+                       if (match(host,xhost.c_str()) || match(ip,xhost.c_str(),true))
                        {
-                               ServerInstance->Log(DEBUG,"'%s' != '%s'",data.c_str(), cert->GetFingerprint().c_str());
-                               return 0;
+                               return true;
                        }
                }
-               else
-               {
-                       ServerInstance->Log(DEBUG,"Lengths dont match");
-                       return 0;
-               }
+               return false;
        }
 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
+
+       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
        {
                irc::string cmd = command.c_str();
                
-               if ((cmd == "OPER") && (validated == 1))
+               if ((cmd == "OPER") && (validated))
                {
+                       char LoginName[MAXBUF];
+                       char Password[MAXBUF];
+                       char OperType[MAXBUF];
+                       char HostName[MAXBUF];
+                       char TheHost[MAXBUF];
+                       char TheIP[MAXBUF];
+                       char FingerPrint[MAXBUF];
+
+                       snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host);
+                       snprintf(TheIP, MAXBUF,"%s@%s",user->ident,user->GetIPString());
+
                        HasCert = user->GetExt("ssl_cert",cert);
                        ServerInstance->Log(DEBUG,"HasCert=%d",HasCert);
+                       for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "oper"); i++)
+                       {
+                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "name", i, LoginName, MAXBUF);
+                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "password", i, Password, MAXBUF);
+                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "type", i, OperType, MAXBUF);
+                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "host", i, HostName, MAXBUF);
+                               ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "fingerprint",  i, FingerPrint, MAXBUF);
+                               
+                               if (*FingerPrint)
+                               {
+                                       if ((!strcmp(LoginName,parameters[0])) && (!ServerInstance->OperPassCompare(Password,parameters[1], i)) && (OneOfMatches(TheHost,TheIP,HostName)))
+                                       {
+                                               /* This oper would match */
+                                               if ((!cert) || (cert->GetFingerprint() != FingerPrint))
+                                               {
+                                                       user->WriteServ("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);
+                                                       return 1;
+                                               }
+                                       }
+                               }
+                       }
                }
                return 0;
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_VENDOR);
+               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
 };