* | 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.
*/
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>";
}
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, 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())
+ {
+ /* same idea as bug #569 */
+ user->WriteServ("NOTICE %s :No hash provider modules are loaded", user->nick.c_str());
}
else
{
/* 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() );
+ user->WriteServ("NOTICE %s :Unknown hash type, valid hash types are: %s", user->nick.c_str(), irc::stringjoiner(", ", names, 0, names.size() - 1).GetJoined().c_str() );
}
}
- CmdResult Handle (const char** parameters, int pcnt, User *user)
+ CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
- MakeHash(user, parameters[0], parameters[1]);
- /* 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;
+ MakeHash(user, parameters[0].c_str(), parameters[1].c_str());
+ // 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;
- ConfigReader* Conf;
+
+ 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,"");
+// Conf = NULL;
+ OnRehash(NULL);
/* Find all modules which implement the interface 'HashRequest' */
modulelist* ml = ServerInstance->Modules->FindInterface("HashRequest");
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.");
+ /* UseInterface doesn't do anything if there are no providers, so we'll have to call it later if a module gets loaded later on. */
+ ServerInstance->Modules->UseInterface("HashRequest");
+ diduseiface = true;
}
- ServerInstance->Modules->UseInterface("HashRequest");
-
- mycommand = new CommandMkpasswd(ServerInstance, this, hashers, names);
- ServerInstance->AddCommand(mycommand);
- Implementation eventlist[] = { I_OnRehash, I_OnPassCompare };
+ ServerInstance->AddCommand(&cmd);
+ Implementation eventlist[] = { I_OnPassCompare, I_OnLoadModule };
ServerInstance->Modules->Attach(eventlist, this, 2);
}
-
+
virtual ~ModuleOperHash()
{
- ServerInstance->Modules->DoneWithInterface("HashRequest");
+ if (diduseiface) ServerInstance->Modules->DoneWithInterface("HashRequest");
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ virtual void OnLoadModule(Module* mod, const std::string& name)
{
- /* Re-read configuration file */
- if (Conf)
- delete Conf;
-
- Conf = new ConfigReader(ServerInstance);
+ if (ServerInstance->Modules->ModuleHasInterface(mod, "HashRequest"))
+ {
+ ServerInstance->Logs->Log("m_password-hash",DEBUG, "Post-load registering hasher: %s", name.c_str());
+ std::string sname = HashNameRequest(this, mod).Send();
+ hashers[sname.c_str()] = mod;
+ names.push_back(sname);
+ if (!diduseiface)
+ {
+ ServerInstance->Modules->UseInterface("HashRequest");
+ diduseiface = true;
+ }
+ }
}
- 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());
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,1,0,1,VF_VENDOR,API_VERSION);
+ return Version("Allows for hashed oper passwords",VF_VENDOR,API_VERSION);
}
};
projects / user / henk / code / inspircd.git / blobdiff