* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
*/
/* $ModDesc: Allows for hashed oper passwords */
-/* $ModDep: m_hash.h */
#include "inspircd.h"
#include "m_hash.h"
-typedef std::map<irc::string, Module*> hashymodules;
-
/* Handle /MKPASSWD
*/
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) : Command(Creator, "MKPASSWD", 2)
{
- this->source = "m_password_hash.so";
syntax = "<hashtype> <any-text>";
+ Penalty = 5;
}
- void MakeHash(User* user, const char* algo, const char* stuff)
+ void MakeHash(User* user, const std::string& algo, const std::string& stuff)
{
- /* Lets see if they gave us an algorithm which has been implemented */
- hashymodules::iterator x = hashers.find(algo);
- if (x != hashers.end())
+ HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + algo);
+ if (hp)
{
- /* 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.c_str(), stuff.c_str(), hp->hexsum(stuff).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", user->nick.c_str());
}
}
- CmdResult Handle (const char** 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;
+
+ return CMD_SUCCESS;
}
};
class ModuleOperHash : public Module
{
-
- CommandMkpasswd* mycommand;
- 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. */
+ CommandMkpasswd cmd;
public:
- ModuleOperHash(InspIRCd* Me)
- : Module(Me)
+ ModuleOperHash() : cmd(this)
{
- diduseiface = false;
-
/* Read the config file first */
-// Conf = NULL;
- OnRehash(NULL,"");
-
- /* Find all modules which implement the interface 'HashRequest' */
- modulelist* ml = ServerInstance->Modules->FindInterface("HashRequest");
-
- /* Did we find any modules? */
- if (ml)
- {
- /* 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();
- /* Build a map of them */
- hashers[name.c_str()] = *m;
- names.push_back(name);
- }
- /* UseInterface doesn't do anything if there are no providers, so we'll have to call it later if a module gets loaded later on. */
- ServerInstance->Modules->UseInterface("HashRequest");
- diduseiface = true;
- }
+ OnRehash(NULL);
- mycommand = new CommandMkpasswd(ServerInstance, this, hashers, names);
- ServerInstance->AddCommand(mycommand);
- Implementation eventlist[] = { I_OnPassCompare, I_OnLoadModule };
- ServerInstance->Modules->Attach(eventlist, this, 2);
- }
-
- virtual ~ModuleOperHash()
- {
- if (diduseiface) ServerInstance->Modules->DoneWithInterface("HashRequest");
- }
-
-
- virtual void OnLoadModule(Module* mod, const std::string& name)
- {
- if (ServerInstance->Modules->ModuleHasInterface(mod, "HashRequest"))
- {
- ServerInstance->Log(DEBUG, "Post-load registering hasher: %s", name.c_str());
- std::string name = HashNameRequest(this, mod).Send();
- hashers[name.c_str()] = mod;
- names.push_back(name);
- if (!diduseiface)
- {
- ServerInstance->Modules->UseInterface("HashRequest");
- diduseiface = true;
- }
- }
+ ServerInstance->AddCommand(&cmd);
+ Implementation eventlist[] = { I_OnPassCompare };
+ ServerInstance->Modules->Attach(eventlist, this, 1);
}
- 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());
+ HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + hashtype);
- /* Is this a valid hash name? (case insensitive) */
- if (x != hashers.end())
+ /* Is this a valid hash name? */
+ if (hp)
{
- /* 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;
+ if (data == hp->hexsum(input))
+ return MOD_RES_ALLOW;
+ else
+ /* No match, and must be hashed, forbid */
+ 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);
}
};