X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_password_hash.cpp;h=814c3351283d98c50e2a8e199f0a122f646b1eda;hb=HEAD;hp=55741ee0b511183d7aadeca578c792a479e9b0f5;hpb=ac7defcd3e52695dcf5e5150e9fe3e1624205e64;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp index 55741ee0b..814c33512 100644 --- a/src/modules/m_password_hash.cpp +++ b/src/modules/m_password_hash.cpp @@ -1,8 +1,14 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2014 Daniel Vassdal + * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2012, 2014-2015 Attila Molnar * Copyright (C) 2009-2010 Daniel De Graaf - * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006, 2010 Craig Edwards * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public @@ -18,10 +24,8 @@ */ -/* $ModDesc: Allows for hashed oper passwords */ - #include "inspircd.h" -#include "hash.h" +#include "modules/hash.h" /* Handle /MKPASSWD */ @@ -30,78 +34,75 @@ class CommandMkpasswd : public Command public: CommandMkpasswd(Module* Creator) : Command(Creator, "MKPASSWD", 2) { - syntax = " "; + syntax = " "; Penalty = 5; } - void MakeHash(User* user, const std::string& algo, const std::string& stuff) + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - if (algo.substr(0,5) == "hmac-") + if (!parameters[0].compare(0, 5, "hmac-", 5)) { - std::string type = algo.substr(5); + std::string type(parameters[0], 5); HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + type); if (!hp) { - user->WriteServ("NOTICE %s :Unknown hash type", user->nick.c_str()); - return; + user->WriteNotice("Unknown hash type"); + return CMD_FAILURE; + } + + if (hp->IsKDF()) + { + user->WriteNotice(type + " does not support HMAC"); + return CMD_FAILURE; } - std::string salt = ServerInstance->GenRandomStr(6, false); - std::string target = hp->hmac(salt, stuff); + + std::string salt = ServerInstance->GenRandomStr(hp->out_size, false); + std::string target = hp->hmac(salt, parameters[1]); 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.c_str(), stuff.c_str(), str.c_str()); - return; - } - HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + algo); - if (hp) - { - /* Now attempt to generate a hash */ - std::string hexsum = hp->hexsum(stuff); - user->WriteServ("NOTICE %s :%s hashed password for %s is %s", - user->nick.c_str(), algo.c_str(), stuff.c_str(), hexsum.c_str()); + user->WriteNotice(parameters[0] + " hashed password for " + parameters[1] + " is " + str); + return CMD_SUCCESS; } - else + + HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + parameters[0]); + if (!hp) { - user->WriteServ("NOTICE %s :Unknown hash type", user->nick.c_str()); + user->WriteNotice("Unknown hash type"); + return CMD_FAILURE; } - } - - CmdResult Handle (const std::vector<std::string>& parameters, User *user) - { - MakeHash(user, parameters[0], parameters[1]); + std::string hexsum = hp->Generate(parameters[1]); + user->WriteNotice(parameters[0] + " hashed password for " + parameters[1] + " is " + hexsum); return CMD_SUCCESS; } }; -class ModuleOperHash : public Module +class ModulePasswordHash : public Module { + private: CommandMkpasswd cmd; - public: - - ModuleOperHash() : cmd(this) - { - } - void init() + public: + ModulePasswordHash() + : cmd(this) { - /* Read the config file first */ - OnRehash(NULL); - - ServerInstance->AddCommand(&cmd); - Implementation eventlist[] = { I_OnPassCompare }; - ServerInstance->Modules->Attach(eventlist, this, 1); } - virtual ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) + ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) CXX11_OVERRIDE { - if (hashtype.substr(0,5) == "hmac-") + if (!hashtype.compare(0, 5, "hmac-", 5)) { - std::string type = hashtype.substr(5); + std::string type(hashtype, 5); HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + type); if (!hp) return MOD_RES_PASSTHRU; + + if (hp->IsKDF()) + { + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Tried to use HMAC with %s, which does not support HMAC", type.c_str()); + return MOD_RES_DENY; + } + // 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) @@ -120,22 +121,21 @@ class ModuleOperHash : public Module /* Is this a valid hash name? */ if (hp) { - /* Compare the hash in the config to the generated hash */ - if (data == hp->hexsum(input)) + if (hp->Compare(input, data)) 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 */ + // We don't handle this type, let other mods or the core decide return MOD_RES_PASSTHRU; } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("Allows for hashed oper passwords",VF_VENDOR); + return Version("Allows passwords to be hashed and adds the /MKPASSWD command which allows the generation of hashed passwords for use in the server configuration.", VF_VENDOR); } }; -MODULE_INIT(ModuleOperHash) +MODULE_INIT(ModulePasswordHash)