X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_oper_hash.cpp;h=8c9ca0556faf3f48c8d985bcf9c1c427cf7aca1e;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=e38aee57a5da39af9367f1a54ae3e869f92a923b;hpb=2ade6284f9044792177664214e7097e23eccd280;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_oper_hash.cpp b/src/modules/m_oper_hash.cpp index e38aee57a..8c9ca0556 100644 --- a/src/modules/m_oper_hash.cpp +++ b/src/modules/m_oper_hash.cpp @@ -2,12 +2,9 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * @@ -15,9 +12,7 @@ */ /* $ModDesc: Allows for hashed oper passwords */ -/* $ModDep: m_md5.h m_sha256.h */ - -using namespace std; +/* $ModDep: m_hash.h */ #include "inspircd_config.h" #include "users.h" @@ -25,62 +20,46 @@ using namespace std; #include "modules.h" #include "inspircd.h" -#include "m_md5.h" -#include "m_sha256.h" +#include "m_hash.h" -enum ProviderTypes -{ - PROV_MD5 = 1, - PROV_SHA = 2 -}; +typedef std::map hashymodules; /* Handle /MKPASSWD */ class cmd_mkpasswd : public command_t { - Module* MD5Provider; - Module* SHAProvider; Module* Sender; - int Prov; + hashymodules &hashers; + std::deque &names; public: - cmd_mkpasswd (InspIRCd* Instance, Module* Sender, Module* MD5Hasher, Module* SHAHasher, int P) - : command_t(Instance,"MKPASSWD", 'o', 2), MD5Provider(MD5Hasher), SHAProvider(SHAHasher), Prov(P) + cmd_mkpasswd (InspIRCd* Instance, Module* S, hashymodules &h, std::deque &n) + : command_t(Instance,"MKPASSWD", 'o', 2), Sender(S), hashers(h), names(n) { this->source = "m_oper_hash.so"; syntax = " "; } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + void MakeHash(userrec* user, const char* algo, const char* stuff) { - if (!strcasecmp(parameters[0], "md5")) - { - if ((Prov & PROV_MD5) > 0) - { - MD5ResetRequest(Sender, Provider).Send(); - user->WriteServ("NOTICE %s :MD5 hashed password for %s is %s",user->nick, parameters[1], MD5SumRequest(Sender, Provider, parameters[1]).Send() ); - } - else - { - user->WriteServ("NOTICE %s :MD5 hashing is not available (m_md5.so not loaded)"); - } - } - else if (!strcasecmp(parameters[0], "sha256")) + /* Lets see if they gave us an algorithm which has been implemented */ + hashymodules::iterator x = hashers.find(algo); + if (x != hashers.end()) { - if ((Prov & PROV_SHA) > 0) - { - SHA256ResetRequest(Sender, Provider).Send(); - user->WriteServ("NOTICE %s :SHA256 hashed password for %s is %s",user->nick, parameters[1], SHA256SumRequest(Sender, Provider, parameters[1]).Send() ); - } - else - { - user->WriteServ("NOTICE %s :SHA256 hashing is not available (m_sha256.so not loaded)"); - } + /* 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() ); } else { - user->WriteServ("NOTICE %s :Unknown hash type, valid hash types are 'sha256' and 'md5'"); + /* 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() ); } + } + CmdResult Handle (const char** parameters, int pcnt, userrec *user) + { + MakeHash(user, parameters[0], parameters[1]); /* NOTE: Don't propogate this across the network! * We dont want plaintext passes going all over the place... * To make sure it goes nowhere, return CMD_FAILURE! @@ -93,33 +72,52 @@ class ModuleOperHash : public Module { cmd_mkpasswd* mycommand; - Module* MD5Provider, SHAProvider; - std::string providername; - int ID; ConfigReader* Conf; + hashymodules hashers; /* List of modules which implement HashRequest */ + std::deque names; /* Module names which implement HashRequest */ public: ModuleOperHash(InspIRCd* Me) - : Module::Module(Me), Conf(NULL) + : Module::Module(Me) { - OnRehash(""); - /* Try to find the md5 service provider, bail if it can't be found */ - MD5Provider = ServerInstance->FindModule("m_md5.so"); - if (MD5Provider) - ID |= PROV_MD5; + /* Read the config file first */ + Conf = NULL; + OnRehash(NULL,""); - SHAProvider = ServerInstance->FindModule("m_sha256.so"); - if (SHAProvider) - ID |= PROV_SHA; + ServerInstance->UseInterface("HashRequest"); - mycommand = new cmd_mkpasswd(ServerInstance, this, MD5Provider, SHAProvider, ID); + /* Find all modules which implement the interface 'HashRequest' */ + modulelist* ml = ServerInstance->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); + } + } + else + { + throw ModuleException("I can't find any modules loaded which implement the HashRequest interface! You probably forgot to load a hashing module such as m_md5.so or m_sha256.so."); + } + + mycommand = new cmd_mkpasswd(ServerInstance, this, hashers, names); ServerInstance->AddCommand(mycommand); } virtual ~ModuleOperHash() { + ServerInstance->DoneWithInterface("HashRequest"); } void Implements(char* List) @@ -127,8 +125,9 @@ class ModuleOperHash : public Module List[I_OnRehash] = List[I_OnOperCompare] = 1; } - virtual void OnRehash(const std::string ¶meter) + virtual void OnRehash(userrec* user, const std::string ¶meter) { + /* Re-read configuration file */ if (Conf) delete Conf; @@ -137,24 +136,26 @@ class ModuleOperHash : public Module virtual int OnOperCompare(const std::string &data, const std::string &input, int tagnumber) { + /* First, lets see what hash theyre using on this oper */ std::string hashtype = Conf->ReadValue("oper", "hash", tagnumber); - if ((hashtype == "sha256") && (data.length() == SHA256_BLOCK_SIZE) && ((ID & PROV_SHA) > 0)) - { - SHA256ResetRequest(this, Provider).Send(); - if (!strcasecmp(data.c_str(), SHA256SumRequest(this, Provider, input.c_str()).Send())) - return 1; - else return -1; - } - else if ((hashtype == "md5") && (data.length() == 32) && ((ID & PROV_MD5) > 0)) + hashymodules::iterator x = hashers.find(hashtype.c_str()); + + /* Is this a valid hash name? (case insensitive) */ + if (x != hashers.end()) { - MD5ResetRequest(this, Provider).Send(); - if (!strcasecmp(data.c_str(), MD5SumRequest(this, Provider, input.c_str()).Send())) + /* 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; } + + /* Not a hash, fall through to strcmp in core */ return 0; } - + virtual Version GetVersion() { return Version(1,1,0,1,VF_VENDOR,API_VERSION);