X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_password_hash.cpp;h=12769acd4d07eb28a49496fa590db166df68f7a3;hb=7107ec12d8640d35cfe3d5002db1bc1deb33625d;hp=bd039865aaf58b5cbb2da152b21f0aecf65bb11d;hpb=da074814501f23680b579feb1ad649c86e8a1348;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index bd039865a..12769acd4 100644
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -23,15 +23,13 @@ typedef std::map<irc::string, Module*> hashymodules;
  */
 class CommandMkpasswd : public Command
 {
-	Module* Sender;
 	hashymodules &hashers;
 	std::deque<std::string> &names;
  public:
-	CommandMkpasswd (InspIRCd* Instance, Module* S, hashymodules &h, std::deque<std::string> &n)
-		: Command(Instance,"MKPASSWD", "o", 2), Sender(S), hashers(h), names(n)
+	CommandMkpasswd(Module* Creator, hashymodules &h, std::deque<std::string> &n) : Command(Creator, "MKPASSWD", 2), hashers(h), names(n)
 	{
-		this->source = "m_password_hash.so";
 		syntax = "<hashtype> <any-text>";
+		Penalty = 5;
 	}
 
 	void MakeHash(User* user, const char* algo, const char* stuff)
@@ -41,46 +39,48 @@ class CommandMkpasswd : public Command
 		if (x != hashers.end())
 		{
 			/* Yup, reset it first (Always ALWAYS do this) */
-			HashResetRequest(Sender, x->second).Send();
+			HashResetRequest(creator, 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() );
+			user->WriteServ("NOTICE %s :%s hashed password for %s is %s",user->nick.c_str(), algo, stuff, HashSumRequest(creator, x->second, stuff).Send() );
+		}
+		else if (names.empty())
+		{
+			/* same idea as bug #569 */
+			user->WriteServ("NOTICE %s :No hash provider modules are loaded", user->nick.c_str());
 		}
 		else
 		{
 			/* 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() );
+			user->WriteServ("NOTICE %s :Unknown hash type, valid hash types are: %s", user->nick.c_str(), irc::stringjoiner(", ", names, 0, names.size() - 1).GetJoined().c_str() );
 		}
 	}
 
-	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
-		MakeHash(user, parameters[0], parameters[1]);
-		/* NOTE: Don't propagate this across the network!
-		 * We dont want plaintext passes going all over the place...
-		 * To make sure it goes nowhere, return CMD_FAILURE!
-		 */
-		return CMD_FAILURE;
+		MakeHash(user, parameters[0].c_str(), parameters[1].c_str());
+
+		return CMD_SUCCESS;
 	}
 };
 
 class ModuleOperHash : public Module
 {
-	
-	CommandMkpasswd* mycommand;
+
+	CommandMkpasswd cmd;
 	hashymodules hashers; /* List of modules which implement HashRequest */
 	std::deque<std::string> names; /* Module names which implement HashRequest */
 
 	bool diduseiface; /* If we've called UseInterface yet. */
  public:
 
-	ModuleOperHash(InspIRCd* Me)
-		: Module(Me)
+	ModuleOperHash()
+		: cmd(this, hashers, names)
 	{
 		diduseiface = false;
 
 		/* Read the config file first */
 //		Conf = NULL;
-		OnRehash(NULL,"");
+		OnRehash(NULL);
 
 		/* Find all modules which implement the interface 'HashRequest' */
 		modulelist* ml = ServerInstance->Modules->FindInterface("HashRequest");
@@ -104,12 +104,11 @@ class ModuleOperHash : public Module
 			diduseiface = true;
 		}
 
-		mycommand = new CommandMkpasswd(ServerInstance, this, hashers, names);
-		ServerInstance->AddCommand(mycommand);
+		ServerInstance->AddCommand(&cmd);
 		Implementation eventlist[] = { I_OnPassCompare, I_OnLoadModule };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
-	
+
 	virtual ~ModuleOperHash()
 	{
 		if (diduseiface) ServerInstance->Modules->DoneWithInterface("HashRequest");
@@ -132,7 +131,7 @@ class ModuleOperHash : public Module
 		}
 	}
 
-	virtual int OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
+	virtual ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
 	{
 		/* First, lets see what hash theyre using on this oper */
 		hashymodules::iterator x = hashers.find(hashtype.c_str());
@@ -144,18 +143,19 @@ class ModuleOperHash : public 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;
+				return MOD_RES_ALLOW;
 			/* No match, and must be hashed, forbid */
-			else return -1;
+			else
+				return MOD_RES_DENY;
 		}
 
 		/* Not a hash, fall through to strcmp in core */
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("Allows for hashed oper passwords",VF_VENDOR,API_VERSION);
 	}
 };