X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_password_hash.cpp;h=44e02eeda8b07368eb15c40ea017d94e476e374c;hb=3cf993500544c2157992650da2487bfa89be405d;hp=b9fcb63a4cef88216d541d687dbc664edfa00e8f;hpb=7e843c22e16c81054bad18073d24fe1a07026431;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp index b9fcb63a4..44e02eeda 100644 --- a/src/modules/m_password_hash.cpp +++ b/src/modules/m_password_hash.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2010 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see @@ -14,49 +14,54 @@ /* $ModDesc: Allows for hashed oper passwords */ #include "inspircd.h" -#include "m_hash.h" - -typedef std::map hashymodules; +#include "hash.h" /* Handle /MKPASSWD */ class CommandMkpasswd : public Command { - hashymodules &hashers; - std::deque &names; public: - CommandMkpasswd(Module* Creator, hashymodules &h, std::deque &n) : Command(Creator, "MKPASSWD", 2), hashers(h), names(n) + CommandMkpasswd(Module* Creator) : Command(Creator, "MKPASSWD", 2) { syntax = " "; 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()) + if (algo.substr(0,5) == "hmac-") { - HashRequest hash(creator, x->second, stuff); - /* Now attempt to generate a hash */ + std::string type = algo.substr(5); + HashProvider* hp = ServerInstance->Modules->FindDataService("hash/" + type); + if (!hp) + { + user->WriteServ("NOTICE %s :Unknown hash type", user->nick.c_str()); + return; + } + std::string salt = ServerInstance->GenRandomStr(6, false); + std::string target = hp->hmac(salt, stuff); + std::string str = BinToBase64(salt) + "$" + BinToBase64(target, NULL, 0); + user->WriteServ("NOTICE %s :%s hashed password for %s is %s", - user->nick.c_str(), algo, stuff, hash.result.c_str()); + user->nick.c_str(), algo.c_str(), stuff.c_str(), str.c_str()); + return; } - else if (names.empty()) + HashProvider* hp = ServerInstance->Modules->FindDataService("hash/" + algo); + if (hp) { - /* same idea as bug #569 */ - user->WriteServ("NOTICE %s :No hash provider modules are loaded", user->nick.c_str()); + /* Now attempt to generate a hash */ + 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.c_str(), irc::stringjoiner(", ", names, 0, names.size() - 1).GetJoined().c_str() ); + user->WriteServ("NOTICE %s :Unknown hash type", user->nick.c_str()); } } CmdResult Handle (const std::vector& parameters, User *user) { - MakeHash(user, parameters[0].c_str(), parameters[1].c_str()); + MakeHash(user, parameters[0], parameters[1]); return CMD_SUCCESS; } @@ -64,85 +69,50 @@ class CommandMkpasswd : public Command class ModuleOperHash : public Module { - CommandMkpasswd cmd; - hashymodules hashers; /* List of modules which implement HashRequest */ - std::deque names; /* Module names which implement HashRequest */ - - bool diduseiface; /* If we've called UseInterface yet. */ public: - ModuleOperHash() - : cmd(this, hashers, names) + 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).response; - /* 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; - } - ServerInstance->AddCommand(&cmd); - Implementation eventlist[] = { I_OnPassCompare, I_OnLoadModule }; - ServerInstance->Modules->Attach(eventlist, this, 2); + Implementation eventlist[] = { I_OnPassCompare }; + ServerInstance->Modules->Attach(eventlist, this, 1); } - virtual ~ModuleOperHash() - { - if (diduseiface) ServerInstance->Modules->DoneWithInterface("HashRequest"); - } - - - virtual void OnLoadModule(Module* mod, const std::string& name) + virtual ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) { - if (ServerInstance->Modules->ModuleHasInterface(mod, "HashRequest")) + if (hashtype.substr(0,5) == "hmac-") { - ServerInstance->Logs->Log("m_password-hash",DEBUG, "Post-load registering hasher: %s", name.c_str()); - std::string sname = HashNameRequest(this, mod).response; - hashers[sname.c_str()] = mod; - names.push_back(sname); - if (!diduseiface) - { - ServerInstance->Modules->UseInterface("HashRequest"); - diduseiface = true; - } + std::string type = hashtype.substr(5); + HashProvider* hp = ServerInstance->Modules->FindDataService("hash/" + type); + if (!hp) + return MOD_RES_PASSTHRU; + // this is a valid hash, from here on we either accept or deny + std::string::size_type sep = data.find('$'); + if (sep == std::string::npos) + return MOD_RES_DENY; + std::string salt = Base64ToBin(data.substr(0, sep)); + std::string target = Base64ToBin(data.substr(sep + 1)); + + if (target == hp->hmac(salt, input)) + return MOD_RES_ALLOW; + else + return MOD_RES_DENY; } - } - 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("hash/" + hashtype); - /* Is this a valid hash name? (case insensitive) */ - if (x != hashers.end()) + /* Is this a valid hash name? */ + if (hp) { /* Compare the hash in the config to the generated hash */ - if (!strcasecmp(data.c_str(), HashRequest(this, x->second, input).result.c_str())) + if (data == hp->hexsum(input)) return MOD_RES_ALLOW; - /* No match, and must be hashed, forbid */ else + /* No match, and must be hashed, forbid */ return MOD_RES_DENY; } @@ -152,7 +122,7 @@ class ModuleOperHash : public Module virtual Version GetVersion() { - return Version("Allows for hashed oper passwords",VF_VENDOR,API_VERSION); + return Version("Allows for hashed oper passwords",VF_VENDOR); } };