*/
/* $ModDesc: Allows for hashed oper passwords */
-/* $ModDep: m_hash.h */
#include "inspircd.h"
#include "m_hash.h"
CommandMkpasswd(Module* Creator, hashymodules &h, std::deque<std::string> &n) : Command(Creator, "MKPASSWD", 2), hashers(h), names(n)
{
syntax = "<hashtype> <any-text>";
+ Penalty = 5;
}
void MakeHash(User* user, const char* algo, const char* stuff)
hashymodules::iterator x = hashers.find(algo);
if (x != hashers.end())
{
- /* Yup, reset it first (Always ALWAYS do this) */
- HashResetRequest(creator, x->second).Send();
+ HashRequest hash(creator, x->second, stuff);
/* Now attempt to generate a hash */
- user->WriteServ("NOTICE %s :%s hashed password for %s is %s",user->nick.c_str(), algo, stuff, HashSumRequest(creator, x->second, stuff).Send() );
+ user->WriteServ("NOTICE %s :%s hashed password for %s is %s",
+ user->nick.c_str(), algo, stuff, hash.hex().c_str());
}
else if (names.empty())
{
CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
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_SUCCESS;
}
bool diduseiface; /* If we've called UseInterface yet. */
public:
- ModuleOperHash(InspIRCd* Me)
- : Module(Me), cmd(this, hashers, names)
+ ModuleOperHash()
+ : cmd(this, hashers, names)
{
diduseiface = false;
/* 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();
+ std::string name = HashNameRequest(this, *m).response;
/* Build a map of them */
hashers[name.c_str()] = *m;
names.push_back(name);
}
- virtual void OnLoadModule(Module* mod, const std::string& name)
+ virtual void OnLoadModule(Module* mod)
{
if (ServerInstance->Modules->ModuleHasInterface(mod, "HashRequest"))
{
- ServerInstance->Logs->Log("m_password-hash",DEBUG, "Post-load registering hasher: %s", name.c_str());
- std::string sname = HashNameRequest(this, mod).Send();
+ std::string sname = HashNameRequest(this, mod).response;
hashers[sname.c_str()] = mod;
names.push_back(sname);
if (!diduseiface)
/* 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()))
+ if (!strcasecmp(data.c_str(), HashRequest(this, x->second, input).hex().c_str()))
return MOD_RES_ALLOW;
/* No match, and must be hashed, forbid */
else
virtual Version GetVersion()
{
- return Version("Allows for hashed oper passwords",VF_VENDOR,API_VERSION);
+ return Version("Allows for hashed oper passwords",VF_VENDOR);
}
};