X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_oper_cert.cpp;h=c67b50c8c82495fd285c8e7ff5a485ad64eff343;hb=d556a4f8740b65e635ff7d2b976faaedbdac51d4;hp=d638ad318a1e0371dea6688f87b667dc7eba1793;hpb=8f385c300681b8872cd0a76054970a3086178823;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp
index d638ad318..c67b50c8c 100644
--- 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,17 +12,14 @@
  */
 
 /* $ModDesc: Allows for MD5 encrypted oper passwords */
-/* $ModDep: ssl_cert.h */
-
-using namespace std;
+/* $ModDep: transport.h */
 
-#include <stdio.h>
+#include "inspircd.h"
 #include "inspircd_config.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
-#include "ssl_cert.h"
+#include "transport.h"
 #include "wildcard.h"
 
 /** Handle /FINGERPRINT
@@ -79,25 +73,32 @@ class ModuleOperSSLCert : public Module
 	ssl_cert* cert;
 	bool HasCert;
 	cmd_fingerprint* mycommand;
+	ConfigReader* cf;
  public:
 
 	ModuleOperSSLCert(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
-		
 		mycommand = new cmd_fingerprint(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+		cf = new ConfigReader(ServerInstance);
 	}
-	
+
 	virtual ~ModuleOperSSLCert()
 	{
+		delete cf;
 	}
 
 	void Implements(char* List)
 	{
-		List[I_OnPreCommand] = 1;
+		List[I_OnPreCommand] = List[I_OnRehash] = 1;
 	}
 
+	virtual void OnRehash(userrec* user, const std::string &parameter)
+	{
+		delete cf;
+		cf = new ConfigReader(ServerInstance);
+	}
 
 	bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 	{
@@ -120,31 +121,40 @@ class ModuleOperSSLCert : public Module
 		
 		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];
+			std::string LoginName;
+			std::string Password;
+			std::string OperType;
+			std::string HostName;
+			std::string FingerPrint;
+			bool SSLOnly;
+			char* dummy;
 
 			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++)
+
+			for (int i = 0; i < cf->Enumerate("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)
+				LoginName = cf->ReadValue("oper", "name", i);
+				Password = cf->ReadValue("oper", "password", i);
+				OperType = cf->ReadValue("oper", "type", i);
+				HostName = cf->ReadValue("oper", "host", i);
+				FingerPrint = cf->ReadValue("oper", "fingerprint", i);
+				SSLOnly = cf->ReadFlag("oper", "sslonly", i);
+
+				if (SSLOnly || !FingerPrint.empty())
 				{
-					if ((!strcmp(LoginName,parameters[0])) && (!ServerInstance->OperPassCompare(Password,parameters[1], i)) && (OneOfMatches(TheHost,TheIP,HostName)))
+					if ((!strcmp(LoginName.c_str(),parameters[0])) && (!ServerInstance->OperPassCompare(Password.c_str(),parameters[1],i)) && (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);
+							return 1;
+						}
+
 						/* This oper would match */
 						if ((!cert) || (cert->GetFingerprint() != FingerPrint))
 						{
@@ -166,26 +176,5 @@ class ModuleOperSSLCert : public Module
 	}
 };
 
-class ModuleOperSSLCertFactory : public ModuleFactory
-{
- public:
-	ModuleOperSSLCertFactory()
-	{
-	}
-	
-	~ModuleOperSSLCertFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleOperSSLCert(Me);
-	}
-	
-};
-
+MODULE_INIT(ModuleOperSSLCert);
 
-extern "C" void * init_module( void )
-{
-	return new ModuleOperSSLCertFactory;
-}