More stuff

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5872 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp
index d256b0f1c65d6983a2d3ed98bbd04e244ea013d0..e02d80fe35b5044fa6b1ca982ae8b565f4080f81 100644 (file)
--- a/src/modules/m_md5.cpp
+++ b/src/modules/m_md5.cpp
@@ -312,7 +312,7 @@ class ModuleMD5 : public Module
                }
                else if (strcmp("NAME", request->GetId()) == 0)
                {
-                       return "MD5";
+                       return "md5";
                }
                else if (strcmp("RESET", request->GetId()) == 0)
                {

diff --git a/src/modules/m_oper_hash.cpp b/src/modules/m_oper_hash.cpp
index 7f768f0e3a665bb832da62993190b2f308371e5c..6f06846430baea155a2edcaa303bb129e6a6c42f 100644 (file)
--- a/src/modules/m_oper_hash.cpp
+++ b/src/modules/m_oper_hash.cpp
@@ -27,49 +27,38 @@ using namespace std;
 
 #include "m_hash.h"
 
-enum ProviderTypes
-{
-       PROV_MD5 = 1,
-       PROV_SHA = 2
-};
-
 /* Handle /MKPASSWD
  */
 class cmd_mkpasswd : public command_t
 {
-       Module* MD5Provider;
-       Module* SHAProvider;
        Module* Sender;
-       int Prov;
+       std::map<std::string, Module*> &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, std::map<std::string, Module*> &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)
+       void MakeHash(userrec* user, 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)
-       {
-               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))
+               std::map<std::string, Module*>::iterator x = hashers.find(algo);
+               if (x != hashers.end())
                {
-                       MakeHash(user, SHAProvider, "SHA256", parameters[1]);
+                       HashResetRequest(Sender, x->second).Send();
+                       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" : "");
+                       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!
@@ -82,20 +71,16 @@ class ModuleOperHash : public Module
 {
        
        cmd_mkpasswd* mycommand;
-       Module* MD5Provider;
-       Module* SHAProvider;
-       std::string providername;
-       int ID;
        ConfigReader* Conf;
-
        std::map<std::string, Module*> hashers;
+       std::deque<std::string> names;
+       modulelist* ml;
 
  public:
 
        ModuleOperHash(InspIRCd* Me)
                : Module::Module(Me)
        {
-               ID = 0;
                Conf = NULL;
                OnRehash("");
 
@@ -109,20 +94,12 @@ class ModuleOperHash : public Module
                        {
                                std::string name = HashNameRequest(this, *m).Send();
                                hashers[name] = *m;
+                               names.push_back(name);
                                ServerInstance->Log(DEBUG, "Found HashRequest interface: '%s' -> '%08x'", name.c_str(), *m);
                        }
                }
 
-               /* 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);
        }
        
@@ -146,27 +123,19 @@ class ModuleOperHash : public Module
        virtual int OnOperCompare(const std::string &data, const std::string &input, int tagnumber)
        {
                std::string hashtype = Conf->ReadValue("oper", "hash", tagnumber);
-               Module* ModPtr = NULL;
+               std::map<std::string, Module*>::iterator x = hashers.find(hashtype);
 
-               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))
-               {
-                       ModPtr = MD5Provider;
-               }
-               if (ModPtr)
+               if (x != hashers.end())
                {
-                       HashResetRequest(this, ModPtr).Send();
-                       if (!strcasecmp(data.c_str(), HashSumRequest(this, ModPtr, input.c_str()).Send()))
+                       HashResetRequest(this, x->second).Send();
+                       if (!strcasecmp(data.c_str(), HashSumRequest(this, x->second, input.c_str()).Send()))
                                return 1;
                        else return -1;
                }
 
                return 0;
        }
-       
+
        virtual Version GetVersion()
        {
                return Version(1,1,0,1,VF_VENDOR,API_VERSION);

diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp
index d6378d40574dbda88e8fab0966020aa830aafd02..d4be6a6a809a19cdc5176bd8e27d969ec98c55d7 100644 (file)
--- a/src/modules/m_sha256.cpp
+++ b/src/modules/m_sha256.cpp
@@ -281,7 +281,7 @@ class ModuleSHA256 : public Module
                }
                else if (strcmp("NAME", request->GetId()) == 0)
                {
-                       return "SHA256";
+                       return "sha256";
                }
                else if (strcmp("RESET", request->GetId()) == 0)
                {