X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_oper_hash.cpp;h=8c9ca0556faf3f48c8d985bcf9c1c427cf7aca1e;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=6f06846430baea155a2edcaa303bb129e6a6c42f;hpb=b3ba32d08abd60cdc4a71c04e716a0fea0942055;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_oper_hash.cpp b/src/modules/m_oper_hash.cpp
index 6f0684643..8c9ca0556 100644
--- a/src/modules/m_oper_hash.cpp
+++ b/src/modules/m_oper_hash.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.
  *
@@ -17,8 +14,6 @@
 /* $ModDesc: Allows for hashed oper passwords */
 /* $ModDep: m_hash.h */
 
-using namespace std;
-
 #include "inspircd_config.h"
 #include "users.h"
 #include "channels.h"
@@ -27,15 +22,17 @@ using namespace std;
 
 #include "m_hash.h"
 
+typedef std::map<irc::string, Module*> hashymodules;
+
 /* Handle /MKPASSWD
  */
 class cmd_mkpasswd : public command_t
 {
 	Module* Sender;
-	std::map<std::string, Module*> &hashers;
+	hashymodules &hashers;
 	std::deque<std::string> &names;
  public:
-	cmd_mkpasswd (InspIRCd* Instance, Module* S, std::map<std::string, Module*> &h, std::deque<std::string> &n)
+	cmd_mkpasswd (InspIRCd* Instance, Module* S, hashymodules &h, std::deque<std::string> &n)
 		: command_t(Instance,"MKPASSWD", 'o', 2), Sender(S), hashers(h), names(n)
 	{
 		this->source = "m_oper_hash.so";
@@ -44,15 +41,19 @@ class cmd_mkpasswd : public command_t
 
 	void MakeHash(userrec* user, const char* algo, const char* stuff)
 	{
-		std::map<std::string, Module*>::iterator x = hashers.find(algo);
+		/* Lets see if they gave us an algorithm which has been implemented */
+		hashymodules::iterator x = hashers.find(algo);
 		if (x != hashers.end())
 		{
+			/* Yup, reset it first (Always ALWAYS do this) */
 			HashResetRequest(Sender, x->second).Send();
+			/* Now attempt to generate a hash */
 			user->WriteServ("NOTICE %s :%s hashed password for %s is %s",user->nick, algo, stuff, HashSumRequest(Sender, x->second, stuff).Send() );
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :Unknown hash type, valid hash types are: %s", user->nick, irc::stringjoiner(",", names, 0, names.size() - 1).GetJoined().c_str() );
+			/* I dont do flying, bob. */
+			user->WriteServ("NOTICE %s :Unknown hash type, valid hash types are: %s", user->nick, irc::stringjoiner(", ", names, 0, names.size() - 1).GetJoined().c_str() );
 		}
 	}
 
@@ -72,32 +73,43 @@ class ModuleOperHash : public Module
 	
 	cmd_mkpasswd* mycommand;
 	ConfigReader* Conf;
-	std::map<std::string, Module*> hashers;
-	std::deque<std::string> names;
-	modulelist* ml;
+	hashymodules hashers; /* List of modules which implement HashRequest */
+	std::deque<std::string> names; /* Module names which implement HashRequest */
 
  public:
 
 	ModuleOperHash(InspIRCd* Me)
 		: Module::Module(Me)
 	{
+
+		/* Read the config file first */
 		Conf = NULL;
-		OnRehash("");
+		OnRehash(NULL,"");
+
+		ServerInstance->UseInterface("HashRequest");
 
+		/* Find all modules which implement the interface 'HashRequest' */
 		modulelist* ml = ServerInstance->FindInterface("HashRequest");
 
+		/* Did we find any modules? */
 		if (ml)
 		{
-			ServerInstance->Log(DEBUG, "Found interface 'HashRequest' containing %d modules", ml->size());
-
+			/* Yes, enumerate them all to find out the hashing algorithm name */
 			for (modulelist::iterator m = ml->begin(); m != ml->end(); m++)
 			{
+				/* Make a request to it for its name, its implementing
+				 * HashRequest so we know its safe to do this
+				 */
 				std::string name = HashNameRequest(this, *m).Send();
-				hashers[name] = *m;
+				/* Build a map of them */
+				hashers[name.c_str()] = *m;
 				names.push_back(name);
-				ServerInstance->Log(DEBUG, "Found HashRequest interface: '%s' -> '%08x'", name.c_str(), *m);
 			}
 		}
+		else
+		{
+			throw ModuleException("I can't find any modules loaded which implement the HashRequest interface! You probably forgot to load a hashing module such as m_md5.so or m_sha256.so.");
+		}
 
 		mycommand = new cmd_mkpasswd(ServerInstance, this, hashers, names);
 		ServerInstance->AddCommand(mycommand);
@@ -105,6 +117,7 @@ class ModuleOperHash : public Module
 	
 	virtual ~ModuleOperHash()
 	{
+		ServerInstance->DoneWithInterface("HashRequest");
 	}
 
 	void Implements(char* List)
@@ -112,8 +125,9 @@ class ModuleOperHash : public Module
 		List[I_OnRehash] = List[I_OnOperCompare] = 1;
 	}
 
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(userrec* user, const std::string &parameter)
 	{
+		/* Re-read configuration file */
 		if (Conf)
 			delete Conf;
 
@@ -122,17 +136,23 @@ class ModuleOperHash : public Module
 
 	virtual int OnOperCompare(const std::string &data, const std::string &input, int tagnumber)
 	{
+		/* First, lets see what hash theyre using on this oper */
 		std::string hashtype = Conf->ReadValue("oper", "hash", tagnumber);
-		std::map<std::string, Module*>::iterator x = hashers.find(hashtype);
+		hashymodules::iterator x = hashers.find(hashtype.c_str());
 
+		/* Is this a valid hash name? (case insensitive) */
 		if (x != hashers.end())
 		{
+			/* Reset the hashing module */
 			HashResetRequest(this, x->second).Send();
+			/* Compare the hash in the config to the generated hash */
 			if (!strcasecmp(data.c_str(), HashSumRequest(this, x->second, input.c_str()).Send()))
 				return 1;
+			/* No match, and must be hashed, forbid */
 			else return -1;
 		}
 
+		/* Not a hash, fall through to strcmp in core */
 		return 0;
 	}