Remove InspIRCd* parameters and fields

[user/henk/code/inspircd.git] / src / modules / m_password_hash.cpp

diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index 81c2d4cac4c3ed9864df2e5a575927a05855af23..011a592e7bab1cde54a8619b8180620f74ad83b1 100644 (file)
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -23,14 +23,11 @@ typedef std::map<irc::string, Module*> hashymodules;
  */
 class CommandMkpasswd : public Command
 {
-       Module* Sender;
        hashymodules &hashers;
        std::deque<std::string> &names;
  public:
-       CommandMkpasswd (InspIRCd* Instance, Module* S, hashymodules &h, std::deque<std::string> &n)
-               : Command(Instance,"MKPASSWD", "o", 2), Sender(S), hashers(h), names(n)
+       CommandMkpasswd(Module* Creator, hashymodules &h, std::deque<std::string> &n) : Command(Creator, "MKPASSWD", 2), hashers(h), names(n)
        {
-               this->source = "m_password_hash.so";
                syntax = "<hashtype> <any-text>";
        }
 
@@ -41,9 +38,9 @@ class CommandMkpasswd : public Command
                if (x != hashers.end())
                {
                        /* Yup, reset it first (Always ALWAYS do this) */
-                       HashResetRequest(Sender, x->second).Send();
+                       HashResetRequest(creator, x->second).Send();
                        /* Now attempt to generate a hash */
-                       user->WriteServ("NOTICE %s :%s hashed password for %s is %s",user->nick.c_str(), algo, stuff, HashSumRequest(Sender, x->second, stuff).Send() );
+                       user->WriteServ("NOTICE %s :%s hashed password for %s is %s",user->nick.c_str(), algo, stuff, HashSumRequest(creator, x->second, stuff).Send() );
                }
                else if (names.empty())
                {
@@ -60,32 +57,32 @@ class CommandMkpasswd : public Command
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
                MakeHash(user, parameters[0].c_str(), parameters[1].c_str());
-               /* NOTE: Don't propagate 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;
+               // this hashing could take some time, increasing server load.
+               // Slow down the user if they are trying to flood mkpasswd requests
+               user->IncreasePenalty(5);
+
+               return CMD_SUCCESS;
        }
 };
 
 class ModuleOperHash : public Module
 {
 
-       CommandMkpasswd* mycommand;
+       CommandMkpasswd cmd;
        hashymodules hashers; /* List of modules which implement HashRequest */
        std::deque<std::string> names; /* Module names which implement HashRequest */
 
        bool diduseiface; /* If we've called UseInterface yet. */
  public:
 
-       ModuleOperHash(InspIRCd* Me)
-               : Module(Me)
+       ModuleOperHash()
+               : cmd(this, hashers, names)
        {
                diduseiface = false;
 
                /* Read the config file first */
 //             Conf = NULL;
-               OnRehash(NULL,"");
+               OnRehash(NULL);
 
                /* Find all modules which implement the interface 'HashRequest' */
                modulelist* ml = ServerInstance->Modules->FindInterface("HashRequest");
@@ -109,8 +106,7 @@ class ModuleOperHash : public Module
                        diduseiface = true;
                }
 
-               mycommand = new CommandMkpasswd(ServerInstance, this, hashers, names);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(&cmd);
                Implementation eventlist[] = { I_OnPassCompare, I_OnLoadModule };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
@@ -137,7 +133,7 @@ class ModuleOperHash : public Module
                }
        }
 
-       virtual int OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
+       virtual ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
        {
                /* First, lets see what hash theyre using on this oper */
                hashymodules::iterator x = hashers.find(hashtype.c_str());
@@ -149,18 +145,19 @@ class ModuleOperHash : public 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;
+                               return MOD_RES_ALLOW;
                        /* No match, and must be hashed, forbid */
-                       else return -1;
+                       else
+                               return MOD_RES_DENY;
                }
 
                /* Not a hash, fall through to strcmp in core */
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+               return Version("Allows for hashed oper passwords",VF_VENDOR,API_VERSION);
        }
 };