* | 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_md5.h m_sha256.h */
-
-using namespace std;
+/* $ModDep: m_hash.h */
-#include "inspircd_config.h"
+#include "inspircd.h"
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "inspircd.h"
+#include "m_hash.h"
-#include "m_md5.h"
-#include "m_sha256.h"
-
-enum ProviderType
-{
- PROV_MD5,
- PROV_SHA
-};
+typedef std::map<irc::string, Module*> hashymodules;
/* Handle /MKPASSWD
*/
class cmd_mkpasswd : public command_t
{
- Module* Provider;
Module* Sender;
- ProviderType Prov;
+ hashymodules &hashers;
+ std::deque<std::string> &names;
public:
- cmd_mkpasswd (InspIRCd* Instance, Module* Sender, Module* Hasher, ProviderType P) : command_t(Instance,"MKPASSWD", 'o', 1), Provider(Hasher), 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 = "<any-text>";
+ syntax = "<hashtype> <any-text>";
}
- CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+ void MakeHash(userrec* user, const char* algo, const char* stuff)
{
- if (Prov == PROV_MD5)
+ /* Lets see if they gave us an algorithm which has been implemented */
+ hashymodules::iterator x = hashers.find(algo);
+ if (x != hashers.end())
{
- MD5ResetRequest(Sender, Provider).Send();
- user->WriteServ("NOTICE %s :MD5 hashed password for %s is %s",user->nick,parameters[0], MD5SumRequest(Sender, Provider, parameters[0]).Send() );
+ /* 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
{
- SHA256ResetRequest(Sender, Provider).Send();
- user->WriteServ("NOTICE %s :SHA256 hashed password for %s is %s",user->nick,parameters[0], SHA256SumRequest(Sender, Provider, parameters[0]).Send() );
+ /* 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() );
}
+ }
- return CMD_SUCCESS;
+ 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!
+ */
+ return CMD_FAILURE;
}
};
{
cmd_mkpasswd* mycommand;
- Module* Provider;
- std::string providername;
- ProviderType ID;
+ ConfigReader* Conf;
+ 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)
{
- ConfigReader Conf(ServerInstance);
- providername = Conf.ReadValue("operhash","algorithm",0);
- if (providername.empty())
- providername = "md5";
+ /* Read the config file first */
+ Conf = NULL;
+ OnRehash(NULL,"");
- if (providername == "md5")
- ID = PROV_MD5;
- else
- ID = PROV_SHA;
+ ServerInstance->UseInterface("HashRequest");
+
+ /* Find all modules which implement the interface 'HashRequest' */
+ modulelist* ml = ServerInstance->FindInterface("HashRequest");
- /* Try to find the md5 service provider, bail if it can't be found */
- Provider = ServerInstance->FindModule(std::string("m_") + providername + ".so");
- if (!Provider)
- throw ModuleException(std::string("Can't find m_") + providername + ".so. Please load m_" + providername + ".so before m_oper_hash.so.");
+ /* 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, Provider, ID);
+ mycommand = new cmd_mkpasswd(ServerInstance, this, hashers, names);
ServerInstance->AddCommand(mycommand);
}
virtual ~ModuleOperHash()
{
+ ServerInstance->DoneWithInterface("HashRequest");
}
void Implements(char* List)
{
- List[I_OnOperCompare] = 1;
+ List[I_OnRehash] = List[I_OnOperCompare] = 1;
}
- virtual int OnOperCompare(const std::string &data, const std::string &input)
+ virtual void OnRehash(userrec* user, const std::string ¶meter)
{
- /* always always reset first */
- if (ID == PROV_MD5)
- {
- MD5ResetRequest(this, Provider).Send();
- if (data.length() == 32) // if its 32 chars long, try it as an md5
- {
- /* Does it match the md5 sum? */
- if (!strcasecmp(data.c_str(), MD5SumRequest(this, Provider, input.c_str()).Send()))
- {
- return 1;
- }
- else return 0;
- }
- }
- else
+ /* Re-read configuration file */
+ if (Conf)
+ delete Conf;
+
+ Conf = new ConfigReader(ServerInstance);
+ }
+
+ 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);
+ hashymodules::iterator x = hashers.find(hashtype.c_str());
+
+ /* Is this a valid hash name? (case insensitive) */
+ if (x != hashers.end())
{
- SHA256ResetRequest(this, Provider).Send();
- if (data.length() == SHA256_BLOCK_SIZE)
- {
- if (!strcasecmp(data.c_str(), SHA256SumRequest(this, Provider, input.c_str()).Send()))
- {
- return 1;
- }
- else return 0;
- }
+ /* 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);
}
};
-
-class ModuleOperHashFactory : public ModuleFactory
-{
- public:
- ModuleOperHashFactory()
- {
- }
-
- ~ModuleOperHashFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleOperHash(Me);
- }
-
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleOperHashFactory;
-}
+MODULE_INIT(ModuleOperHash)
projects / user / henk / code / inspircd.git / blobdiff