* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * 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.
*
/* $ModDesc: Allows for hashed oper passwords */
/* $ModDep: m_hash.h */
-using namespace std;
-
#include "inspircd_config.h"
#include "users.h"
#include "channels.h"
#include "m_hash.h"
-enum ProviderTypes
-{
- PROV_MD5 = 1,
- PROV_SHA = 2
-};
+typedef std::map<irc::string, Module*> hashymodules;
/* Handle /MKPASSWD
*/
class cmd_mkpasswd : public command_t
{
- Module* MD5Provider;
- Module* SHAProvider;
Module* Sender;
- int Prov;
+ hashymodules &hashers;
+ std::deque<std::string> &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<std::string> &n)
+ : command_t(Instance,"MKPASSWD", 'o', 2), Sender(S), hashers(h), names(n)
{
this->source = "m_oper_hash.so";
syntax = "<hashtype> <any-text>";
}
- void MakeHash(userrec* user, Module* ProviderMod, const char* algo, const char* stuff)
- {
- HashResetRequest(Sender, ProviderMod).Send();
- user->WriteServ("NOTICE %s :%s hashed password for %s is %s",user->nick, algo, stuff, HashSumRequest(Sender, ProviderMod, stuff).Send() );
- }
-
- CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+ void MakeHash(userrec* user, const char* algo, const char* stuff)
{
- if ((!strcasecmp(parameters[0], "MD5")) && ((Prov & PROV_MD5) > 0))
- {
- MakeHash(user, MD5Provider, "MD5", parameters[1]);
- }
- else if ((!strcasecmp(parameters[0], "SHA256")) && ((Prov & PROV_SHA) > 0))
+ /* Lets see if they gave us an algorithm which has been implemented */
+ hashymodules::iterator x = hashers.find(algo);
+ if (x != hashers.end())
{
- MakeHash(user, SHAProvider, "SHA256", parameters[1]);
+ /* 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:%s%s", user->nick, ((Prov & PROV_MD5) > 0) ? " MD5" : "", ((Prov & PROV_SHA) > 0) ? " SHA256" : "");
+ /* 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!
{
cmd_mkpasswd* mycommand;
- Module* MD5Provider;
- Module* SHAProvider;
- std::string providername;
- int ID;
ConfigReader* Conf;
-
- std::map<std::string, Module*> hashers;
+ hashymodules hashers; /* List of modules which implement HashRequest */
+ std::deque<std::string> names; /* Module names which implement HashRequest */
public:
ModuleOperHash(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
- ID = 0;
+
+ /* Read the config file first */
Conf = NULL;
- OnRehash("");
+ OnRehash(NULL,"");
+
+ ServerInstance->UseInterface("HashRequest");
+ /* Find all modules which implement the interface 'HashRequest' */
modulelist* ml = ServerInstance->FindInterface("HashRequest");
+ /* Did we find any modules? */
if (ml)
{
- ServerInstance->Log(DEBUG, "Found interface 'HashRequest' containing %d modules", ml->size());
-
+ /* 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();
- hashers[name] = *m;
- ServerInstance->Log(DEBUG, "Found HashRequest interface: '%s' -> '%08x'", name.c_str(), *m);
+ /* 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.");
+ }
- /* 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;
-
- SHAProvider = ServerInstance->FindModule("m_sha256.so");
- if (SHAProvider)
- ID |= PROV_SHA;
-
- mycommand = new cmd_mkpasswd(ServerInstance, this, MD5Provider, SHAProvider, ID);
+ mycommand = new cmd_mkpasswd(ServerInstance, this, hashers, names);
ServerInstance->AddCommand(mycommand);
}
virtual ~ModuleOperHash()
{
+ ServerInstance->DoneWithInterface("HashRequest");
}
void Implements(char* List)
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;
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);
- Module* ModPtr = NULL;
+ hashymodules::iterator x = hashers.find(hashtype.c_str());
- if ((hashtype == "sha256") && (data.length() == SHA256_BLOCK_SIZE) && ((ID & PROV_SHA) > 0))
- {
- ModPtr = SHAProvider;
- }
- else if ((hashtype == "md5") && (data.length() == 32) && ((ID & PROV_MD5) > 0))
+ /* Is this a valid hash name? (case insensitive) */
+ if (x != hashers.end())
{
- ModPtr = MD5Provider;
- }
- if (ModPtr)
- {
- HashResetRequest(this, ModPtr).Send();
- if (!strcasecmp(data.c_str(), HashSumRequest(this, ModPtr, 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);
};
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
{
return new ModuleOperHashFactory;
}
projects / user / henk / code / inspircd.git / blobdiff