X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_password_hash.cpp;h=e91bedd70ce4f08f63ad707535570ee55c9ad27f;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=68ed39c4d5e844354bcfbda183c331aaa610e4c1;hpb=638381c529a2f19c699718234d689e54ad459c97;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index 68ed39c4d..e91bedd70 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.
@@ -28,7 +28,7 @@ class CommandMkpasswd : public Command
 	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)
+		: Command(Instance,"MKPASSWD", 0, 2), Sender(S), hashers(h), names(n)
 	{
 		this->source = "m_password_hash.so";
 		syntax = "<hashtype> <any-text>";
@@ -43,30 +43,35 @@ class CommandMkpasswd : public Command
 			/* 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() );
+			user->WriteServ("NOTICE %s :%s hashed password for %s is %s",user->nick.c_str(), algo, stuff, HashSumRequest(Sender, 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());
+		// this hashing could take some time, increasing server load.
+		// Slow down the user if they are trying to flood mkpasswd requests
+		user->IncreasePenalty(5);
+
+		return CMD_LOCALONLY;
 	}
 };
 
 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 */
 
@@ -74,13 +79,13 @@ class ModuleOperHash : public Module
  public:
 
 	ModuleOperHash(InspIRCd* Me)
-		: Module(Me)
+		: Module(Me), cmd(Me, 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 +109,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");
@@ -155,7 +159,7 @@ class ModuleOperHash : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_VENDOR,API_VERSION);
 	}
 };