* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * 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 <string>
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "inspircd.h"
-#include "configreader.h"
-#include "helperfuncs.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 m_hash.h */
-/* Required for the FOREACH_MOD alias (OnOper event) */
-extern int MODCOUNT;
-extern ServerConfig* Config;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+typedef std::map<irc::string, Module*> hashymodules;
class ModuleSQLOper : public Module
{
- Server* Srv;
Module* SQLutils;
std::string databaseid;
+ irc::string hashtype;
+ hashymodules hashers;
+ bool diduseiface;
+ parameterlist names;
public:
- ModuleSQLOper(Server* Me)
- : Module::Module(Me), Srv(Me)
+ ModuleSQLOper(InspIRCd* Me)
+ : Module(Me)
{
- SQLutils = Srv->FindFeature("SQLutils");
-
- if(SQLutils)
+ ServerInstance->Modules->UseInterface("SQLutils");
+ ServerInstance->Modules->UseInterface("SQL");
+ ServerInstance->Modules->UseInterface("HashRequest");
+
+ 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)
{
- log(DEBUG, "Successfully got SQLutils pointer");
+ /* 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");
}
- else
+
+ 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.");
+
+ 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)
{
- log(DEFAULT, "ERROR: This module requires a module offering the 'SQLutils' feature (usually m_sqlutils.so). Please load it and try again.");
- throw ModuleException("This module requires a module offering the 'SQLutils' feature (usually m_sqlutils.so). Please load it and try again.");
+ if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map))
+ {
+ return true;
+ }
}
-
- OnRehash("");
+ return false;
}
- virtual void OnRehash(const std::string ¶meter)
+ virtual void OnLoadModule(Module* mod, const std::string& name)
{
- ConfigReader Conf;
-
- databaseid = Conf.ReadValue("sqloper", "dbid", 0); /* Database ID of a database configured for the service provider module */
+ 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;
+ }
+ }
}
- void Implements(char* List)
+ virtual ~ModuleSQLOper()
{
- List[I_OnRequest] = List[I_OnRehash] = List[I_OnPreCommand] = 1;
+ ServerInstance->Modules->DoneWithInterface("SQL");
+ ServerInstance->Modules->DoneWithInterface("SQLutils");
+ if (diduseiface)
+ ServerInstance->Modules->DoneWithInterface("HashRequest");
}
- virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
+
+ virtual void OnRehash(User* user)
{
- if (validated && (command == "OPER"))
+ 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(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]))
- {
+ 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
+ * for /oper by calling its Handle method directly.
*/
return 1;
}
}
-
return 0;
}
- bool LookupOper(userrec* user, const std::string &username, const std::string &password)
+ bool LookupOper(User* user, const std::string &username, const std::string &password)
{
Module* target;
-
- target = Srv->FindFeature("SQL");
-
- if(target)
+
+ target = ServerInstance->Modules->FindFeature("SQL");
+
+ if (target)
{
- SQLrequest req = SQLreq(this, target, databaseid, "SELECT username, password, hostname, type FROM ircd_opers WHERE username = '?' AND password=md5('?')", username, password);
-
- if(req.Send())
+ hashymodules::iterator x = hashers.find(hashtype);
+ if (x == hashers.end())
+ return false;
+
+ /* Reset hash module first back to MD5 standard state */
+ HashResetRequest(this, x->second).Send();
+ /* Make an MD5 hash of the password for using in the query */
+ std::string md5_pass_hash = HashSumRequest(this, x->second, password.c_str()).Send();
+
+ /* 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);
+
+ if (req.Send())
{
/* When we get the query response from the service provider we will be given an ID to play with,
- * just an ID number which is unique to this query. We need a way of associating that ID with a userrec
+ * just an ID number which is unique to this query. We need a way of associating that ID with a User
* so we insert it into a map mapping the IDs to users.
* Thankfully m_sqlutils provides this, it will associate a ID with a user or channel, and if the user quits it removes the
* association. This means that if the user quits during a query we will just get a failed lookup from m_sqlutils - telling
* us to discard the query.
*/
- log(DEBUG, "Sent query, got given ID %lu", req.id);
-
AssociateUser(this, SQLutils, req.id, user).Send();
-
+
+ user->Extend("oper_user", strdup(username.c_str()));
+ user->Extend("oper_pass", strdup(password.c_str()));
+
return true;
}
else
{
- log(DEBUG, "SQLrequest failed: %s", req.error.Str());
-
return false;
}
}
else
{
- 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->GetData()) == 0)
+ if (strcmp(SQLRESID, request->GetId()) == 0)
{
- SQLresult* res;
-
- res = static_cast<SQLresult*>(request);
-
- log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetData(), res->id);
-
- userrec* user = GetAssocUser(this, SQLutils, res->id).S().user;
+ SQLresult* res = static_cast<SQLresult*>(request);
+
+ User* user = GetAssocUser(this, SQLutils, res->id).S().user;
UnAssociate(this, SQLutils, res->id).S();
-
- if(user)
+
+ char* tried_user = NULL;
+ char* tried_pass = NULL;
+
+ user->GetExt("oper_user", tried_user);
+ user->GetExt("oper_pass", tried_pass);
+
+ if (user)
{
- if(res->error.Id() == NO_ERROR)
- {
- log(DEBUG, "Associated query ID %lu with user %s", res->id, user->nick);
- log(DEBUG, "Got result with %d rows and %d columns", res->Rows(), res->Cols());
-
- if(res->Rows())
+ 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())
+
+ for (SQLfieldMap& row = res->GetRowMap(); row.size(); row = res->GetRowMap())
{
- log(DEBUG, "Trying to oper user %s with username = '%s', passhash = '%s', hostname = '%s', type = '%s'", user->nick, row["username"].d.c_str(), row["password"].d.c_str(), row["hostname"].d.c_str(), row["type"].d.c_str());
-
- 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;
}
+ if (tried_user && tried_pass)
+ {
+ LoginFail(user, tried_user, tried_pass);
+ free(tried_user);
+ free(tried_pass);
+ user->Shrink("oper_user");
+ user->Shrink("oper_pass");
+ }
}
}
else
* we should have already checked the o:lines so now we need an
* "insufficient awesomeness" (invalid credentials) error
*/
-
- WriteServ(user->fd, "491 %s :Invalid oper credentials", user->nick);
- WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s!", user->nick, user->ident, user->host);
- log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: user, host or password did not match.", user->nick, user->ident, user->host);
+ if (tried_user && tried_pass)
+ {
+ LoginFail(user, tried_user, tried_pass);
+ free(tried_user);
+ free(tried_pass);
+ user->Shrink("oper_user");
+ user->Shrink("oper_pass");
+ }
}
}
else
* We have to fail the /oper request and give them the same error
* as above.
*/
- log(DEBUG, "Query failed: %s", res->error.Str());
+ if (tried_user && tried_pass)
+ {
+ LoginFail(user, tried_user, tried_pass);
+ free(tried_user);
+ free(tried_pass);
+ user->Shrink("oper_user");
+ user->Shrink("oper_pass");
+ }
- WriteServ(user->fd, "491 %s :Invalid oper credentials", user->nick);
- WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s! (SQL query failed: %s)", user->nick, user->ident, user->host, res->error.Str());
- log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: user, host or password did not match.", user->nick, user->ident, user->host);
}
}
- else
- {
- log(DEBUG, "Got query with unknown ID, this probably means the user quit while the query was in progress");
- }
-
+
return SQLSUCCESS;
}
-
- log(DEBUG, "Got unsupported API version string: %s", request->GetData());
-
+
return NULL;
- }
+ }
- bool OperUser(userrec* user, const std::string &username, const std::string &password, const std::string &pattern, const std::string &type)
+ void LoginFail(User* user, const std::string &username, const std::string &pass)
{
- ConfigReader Conf;
-
+ Command* oper_command = ServerInstance->Parser->GetHandler("OPER");
+
+ if (oper_command)
+ {
+ std::vector<std::string> params;
+ params.push_back(username);
+ params.push_back(pass);
+ oper_command->Handle(params, user);
+ }
+ else
+ {
+ ServerInstance->Logs->Log("m_sqloper",DEBUG, "BUG: WHAT?! Why do we have no OPER command?!");
+ }
+ }
+
+ 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);
-
- log(DEBUG, "Scanning opertype: %s", tname.c_str());
-
std::string hostname(user->ident);
+
hostname.append("@").append(user->host);
-
- if((tname == type) && OneOfMatches(hostname.c_str(), pattern.c_str()))
+
+ if ((tname == type) && OneOfMatches(hostname.c_str(), user->GetIPString(), pattern.c_str()))
{
/* Opertype and host match, looks like this is it. */
- log(DEBUG, "Host (%s matched %s) and type (%s)", pattern.c_str(), hostname.c_str(), type.c_str());
-
std::string operhost = Conf.ReadValue("type", "host", j);
-
- if(operhost.size())
- Srv->ChangeHost(user, operhost);
-
- strlcpy(user->oper, type.c_str(), NICKMAX-1);
-
- WriteOpers("*** %s (%s@%s) is now an IRC operator of type %s", user->nick, user->ident, user->host, type.c_str());
- WriteServ(user->fd,"381 %s :You are now an IRC operator of type %s", user->nick, type.c_str());
-
- if(!user->modes[UM_OPERATOR])
- {
- user->modes[UM_OPERATOR] = 1;
- WriteServ(user->fd,"MODE %s :+o",user->nick);
- FOREACH_MOD(I_OnOper,OnOper(user, type));
- AddOper(user);
- FOREACH_MOD(I_OnPostOper,OnPostOper(user, type));
- log(DEFAULT,"OPER: %s!%s@%s opered as type: %s", user->nick, user->ident, user->host, type.c_str());
- }
-
+
+ if (operhost.size())
+ user->ChangeDisplayedHost(operhost.c_str());
+
+ user->Oper(type, tname);
return true;
}
}
-
+
return false;
}
- virtual ~ModuleSQLOper()
- {
- }
-
virtual Version GetVersion()
{
- return Version(1,0,1,0,VF_VENDOR);
+ return Version("$Id$", VF_VENDOR, API_VERSION);
}
-
-};
-class ModuleSQLOperFactory : public ModuleFactory
-{
- public:
- ModuleSQLOperFactory()
- {
- }
-
- ~ModuleSQLOperFactory()
- {
- }
-
- virtual Module * CreateModule(Server* Me)
- {
- return new ModuleSQLOper(Me);
- }
-
};
-
-extern "C" void * init_module( void )
-{
- return new ModuleSQLOperFactory;
-}
+MODULE_INIT(ModuleSQLOper)
projects / user / henk / code / inspircd.git / blobdiff