* | 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.
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>";
/* 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 */
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");
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");
virtual Version GetVersion()
{
- return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+ return Version("$Id$",VF_VENDOR,API_VERSION);
}
};