* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 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.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
-
#include "m_sqlv2.h"
#include "m_sqlutils.h"
#include "m_hash.h"
#include "commands/cmd_oper.h"
/* $ModDesc: Allows storage of oper credentials in an SQL table */
-/* $ModDep: m_sqlv2.h m_sqlutils.h */
-/* $CompileFlags: -Wno-variadic-macros */
+/* $ModDep: m_sqlv2.h m_sqlutils.h m_hash.h */
+
+typedef std::map<irc::string, Module*> hashymodules;
class ModuleSQLOper : public Module
{
Module* SQLutils;
- Module* HashModule;
std::string databaseid;
+ irc::string hashtype;
+ hashymodules hashers;
+ bool diduseiface;
+ parameterlist names;
public:
ModuleSQLOper(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
ServerInstance->Modules->UseInterface("SQLutils");
ServerInstance->Modules->UseInterface("SQL");
ServerInstance->Modules->UseInterface("HashRequest");
- /* Attempt to locate the md5 service provider, bail if we can't find it */
- HashModule = ServerInstance->Modules->Find("m_md5.so");
- if (!HashModule)
- throw ModuleException("Can't find m_md5.so. Please load m_md5.so before m_sqloper.so.");
+ OnRehash(NULL);
+
+ diduseiface = false;
+
+ /* Find all modules which implement the interface 'HashRequest' */
+ modulelist* ml = ServerInstance->Modules->FindInterface("HashRequest");
+
+ /* 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);
+ }
+ /* 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. */
+ diduseiface = true;
+ ServerInstance->Modules->UseInterface("HashRequest");
+ }
SQLutils = ServerInstance->Modules->Find("m_sqlutils.so");
if (!SQLutils)
throw ModuleException("Can't find m_sqlutils.so. Please load m_sqlutils.so before m_sqloper.so.");
- OnRehash(NULL,"");
+ Implementation eventlist[] = { I_OnRequest, I_OnRehash, I_OnPreCommand, I_OnLoadModule };
+ ServerInstance->Modules->Attach(eventlist, this, 3);
+ }
+
+ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
+ {
+ std::stringstream hl(hostlist);
+ std::string xhost;
+ while (hl >> xhost)
+ {
+ if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ virtual void OnLoadModule(Module* mod, const std::string& name)
+ {
+ if (ServerInstance->Modules->ModuleHasInterface(mod, "HashRequest"))
+ {
+ ServerInstance->Logs->Log("m_sqloper",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 ~ModuleSQLOper()
{
ServerInstance->Modules->DoneWithInterface("SQL");
ServerInstance->Modules->DoneWithInterface("SQLutils");
- ServerInstance->Modules->DoneWithInterface("HashRequest");
+ if (diduseiface)
+ ServerInstance->Modules->DoneWithInterface("HashRequest");
}
- void Implements(char* List)
- {
- List[I_OnRequest] = List[I_OnRehash] = List[I_OnPreCommand] = 1;
- }
- virtual void OnRehash(User* user, const std::string ¶meter)
+ virtual void OnRehash(User* user)
{
ConfigReader Conf(ServerInstance);
-
+
databaseid = Conf.ReadValue("sqloper", "dbid", 0); /* Database ID of a database configured for the service provider module */
+ hashtype = assign(Conf.ReadValue("sqloper", "hash", 0));
}
- virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+ virtual int OnPreCommand(std::string &command, std::vector<std::string> ¶meters, User *user, bool validated, const std::string &original_line)
{
if ((validated) && (command == "OPER"))
{
if (LookupOper(user, parameters[0], parameters[1]))
- {
+ {
/* Returning true here just means the query is in progress, or on it's way to being
* in progress. Nothing about the /oper actually being successful..
* If the oper lookup fails later, we pass the command to the original handler
bool LookupOper(User* user, const std::string &username, const std::string &password)
{
Module* target;
-
+
target = ServerInstance->Modules->FindFeature("SQL");
if (target)
{
+ hashymodules::iterator x = hashers.find(hashtype);
+ if (x == hashers.end())
+ return false;
+
/* Reset hash module first back to MD5 standard state */
- HashResetRequest(this, HashModule).Send();
+ HashResetRequest(this, x->second).Send();
/* Make an MD5 hash of the password for using in the query */
- std::string md5_pass_hash = HashSumRequest(this, HashModule, password.c_str()).Send();
+ std::string md5_pass_hash = HashSumRequest(this, x->second, password.c_str()).Send();
- /* We generate our own MD5 sum here because some database providers (e.g. SQLite) dont have a builtin md5 function,
+ /* We generate our own sum here because some database providers (e.g. SQLite) dont have a builtin md5/sha256 function,
* also hashing it in the module and only passing a remote query containing a hash is more secure.
*/
+ SQLrequest req = SQLrequest(this, target, databaseid,
+ SQLquery("SELECT username, password, hostname, type FROM ircd_opers WHERE username = '?' AND password='?'") % username % md5_pass_hash);
- SQLrequest req = SQLreq(this, target, databaseid, "SELECT username, password, hostname, type FROM ircd_opers WHERE username = '?' AND password='?'", username, md5_pass_hash);
-
if (req.Send())
{
/* When we get the query response from the service provider we will be given an ID to play with,
user->Extend("oper_user", strdup(username.c_str()));
user->Extend("oper_pass", strdup(password.c_str()));
-
+
return true;
}
else
}
else
{
- ServerInstance->Log(SPARSE, "WARNING: Couldn't find SQL provider module. NOBODY will be able to oper up unless their o:line is statically configured");
+ ServerInstance->Logs->Log("m_sqloper",SPARSE, "WARNING: Couldn't find SQL provider module. NOBODY will be able to oper up unless their o:line is statically configured");
return false;
}
}
-
- virtual char* OnRequest(Request* request)
+
+ virtual const char* OnRequest(Request* request)
{
if (strcmp(SQLRESID, request->GetId()) == 0)
{
user->GetExt("oper_user", tried_user);
user->GetExt("oper_pass", tried_pass);
-
+
if (user)
{
- if (res->error.Id() == NO_ERROR)
+ if (res->error.Id() == SQL_NO_ERROR)
{
if (res->Rows())
{
/* We got a row in the result, this means there was a record for the oper..
* now we just need to check if their host matches, and if it does then
* oper them up.
- *
+ *
* We now (previous versions of the module didn't) support multiple SQL
* rows per-oper in the same way the config file does, all rows will be tried
* until one is found which matches. This is useful to define several different
* hosts for a single oper.
- *
+ *
* The for() loop works as SQLresult::GetRowMap() returns an empty map when there
* are no more rows to return.
*/
-
+
for (SQLfieldMap& row = res->GetRowMap(); row.size(); row = res->GetRowMap())
- {
- if (OperUser(user, row["username"].d, row["password"].d, row["hostname"].d, row["type"].d))
+ {
+ if (OperUser(user, row["hostname"].d, row["type"].d))
{
/* If/when one of the rows matches, stop checking and return */
return SQLSUCCESS;
}
}
-
+
return SQLSUCCESS;
}
if (oper_command)
{
- const char* params[] = { username.c_str(), pass.c_str() };
- oper_command->Handle(params, 2, user);
+ std::vector<std::string> params;
+ params.push_back(username);
+ params.push_back(pass);
+ oper_command->Handle(params, user);
}
else
{
- ServerInstance->Log(DEBUG, "BUG: WHAT?! Why do we have no OPER command?!");
+ ServerInstance->Logs->Log("m_sqloper",DEBUG, "BUG: WHAT?! Why do we have no OPER command?!");
}
}
- bool OperUser(User* user, const std::string &username, const std::string &password, const std::string &pattern, const std::string &type)
+ bool OperUser(User* user, const std::string &pattern, const std::string &type)
{
ConfigReader Conf(ServerInstance);
-
+
for (int j = 0; j < Conf.Enumerate("type"); j++)
{
std::string tname = Conf.ReadValue("type","name",j);
std::string hostname(user->ident);
hostname.append("@").append(user->host);
-
+
if ((tname == type) && OneOfMatches(hostname.c_str(), user->GetIPString(), pattern.c_str()))
{
/* Opertype and host match, looks like this is it. */
if (operhost.size())
user->ChangeDisplayedHost(operhost.c_str());
- ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s", user->nick, user->ident, user->host, type.c_str());
- user->WriteServ("381 %s :You are now %s %s",user->nick, strchr("aeiouAEIOU", type[0]) ? "an" : "a", irc::Spacify(type.c_str()));
-
- if (!user->modes[UM_OPERATOR])
- user->Oper(type);
-
+ user->Oper(type, tname);
return true;
}
}
-
+
return false;
}
virtual Version GetVersion()
{
- return Version(1,1,1,0,VF_VENDOR,API_VERSION);
+ return Version("$Id$", VF_VENDOR, API_VERSION);
}
-
+
};
MODULE_INIT(ModuleSQLOper)
projects / user / henk / code / inspircd.git / blobdiff