X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fextra%2Fm_sqloper.cpp;h=f3c32b14047af9057ffb1011eed245272053099c;hb=12427e75fe175fe7a62f388281dd7ab5100c9dda;hp=93820390dbd4a3c0c218fd3fd268445bfee84085;hpb=27634449b86267d58920c30f9e2da05fa5096c9d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp index 93820390d..f3c32b140 100644 --- a/src/modules/extra/m_sqloper.cpp +++ b/src/modules/extra/m_sqloper.cpp @@ -2,73 +2,119 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -#include +#include "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" -#include "inspircd.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 m_hash.h */ + +typedef std::map hashymodules; class ModuleSQLOper : public Module { - InspIRCd* Srv; Module* SQLutils; std::string databaseid; + irc::string hashtype; + hashymodules hashers; + bool diduseiface; + std::deque names; public: ModuleSQLOper(InspIRCd* Me) - : Module::Module(Me), Srv(Me) + : Module::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) { - ServerInstance->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); + } + + virtual void OnLoadModule(Module* mod, const std::string& name) + { + if (ServerInstance->Modules->ModuleHasInterface(mod, "HashRequest")) { - ServerInstance->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."); + 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; + } } - - OnRehash(""); } - virtual void OnRehash(const std::string ¶meter) + virtual ~ModuleSQLOper() { - ConfigReader Conf(Srv); - - databaseid = Conf.ReadValue("sqloper", "dbid", 0); /* Database ID of a database configured for the service provider module */ + ServerInstance->Modules->DoneWithInterface("SQL"); + ServerInstance->Modules->DoneWithInterface("SQLutils"); + if (diduseiface) + ServerInstance->Modules->DoneWithInterface("HashRequest"); } - void Implements(char* List) + + virtual void OnRehash(User* user, const std::string ¶meter) { - List[I_OnRequest] = List[I_OnRehash] = List[I_OnPostCommand] = 1; + 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 void OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line) + virtual int OnPreCommand(const std::string &command, const std::vector ¶meters, User *user, bool validated, const std::string &original_line) { - if ((result == CMD_FAILURE) && (command == "OPER")) + if ((validated) && (command == "OPER")) { -<<<<<<< .mine if (LookupOper(user, parameters[0], parameters[1])) { /* Returning true here just means the query is in progress, or on it's way to being @@ -78,71 +124,80 @@ public: */ return 1; } -======= - LookupOper(user, parameters[0], parameters[1]); ->>>>>>> .r5635 } + 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"); - + 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); + 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. */ - ServerInstance->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 { - ServerInstance->Log(DEBUG, "SQLrequest failed: %s", req.error.Str()); - return false; } } 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) { - SQLresult* res; - - res = static_cast(request); - - ServerInstance->Log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetId(), res->id); - - userrec* user = GetAssocUser(this, SQLutils, res->id).S().user; + SQLresult* res = static_cast(request); + + User* user = GetAssocUser(this, SQLutils, res->id).S().user; UnAssociate(this, SQLutils, res->id).S(); + + 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) - { - ServerInstance->Log(DEBUG, "Associated query ID %lu with user %s", res->id, user->nick); - ServerInstance->Log(DEBUG, "Got result with %d rows and %d columns", res->Rows(), res->Cols()); - + { if (res->Rows()) { /* We got a row in the result, this means there was a record for the oper.. @@ -159,14 +214,20 @@ public: */ for (SQLfieldMap& row = res->GetRowMap(); row.size(); row = res->GetRowMap()) - { - ServerInstance->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/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 @@ -175,8 +236,14 @@ public: * we should have already checked the o:lines so now we need an * "insufficient awesomeness" (invalid credentials) error */ - - LoginFail(user, row["username"].d, row["password"].d); + 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 @@ -185,68 +252,66 @@ public: * We have to fail the /oper request and give them the same error * as above. */ - ServerInstance->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"); + } - LoginFail(user, row["username"].d, row["password"].d); } } - else - { - ServerInstance->Log(DEBUG, "Got query with unknown ID, this probably means the user quit while the query was in progress"); - } return SQLSUCCESS; } - - ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId()); - + return NULL; } - void LoginFail(userrec* user, const std::string &user, const std::string &pass) + void LoginFail(User* user, const std::string &username, const std::string &pass) { - command_t* oper_command = ServerInstance->Parser->GetCommand("OPER"); + Command* oper_command = ServerInstance->Parser->GetHandler("OPER"); if (oper_command) { - const char* params = { user.c_str(), pass.c_str() }; - oper_command->Handle(params, 2, user); + std::vector params; + params.push_back(username); + params.push_back(pass); + oper_command->Handle(params, user); } else { - ServerInstance->Log(DEBUG, "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(userrec* user, const std::string &username, const std::string &password, const std::string &pattern, const std::string &type) + bool OperUser(User* user, const std::string &username, const std::string &password, const std::string &pattern, const std::string &type) { - ConfigReader Conf(Srv); + ConfigReader Conf(ServerInstance); for (int j = 0; j < Conf.Enumerate("type"); j++) { std::string tname = Conf.ReadValue("type","name",j); - - ServerInstance->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(), user->GetIPString(), pattern.c_str())) { /* Opertype and host match, looks like this is it. */ - ServerInstance->Log(DEBUG, "Host (%s matched %s OR %s) and type (%s)", pattern.c_str(), hostname.c_str(), user->GetIPString(), type.c_str()); - std::string operhost = Conf.ReadValue("type", "host", j); - + if (operhost.size()) user->ChangeDisplayedHost(operhost.c_str()); - - Srv->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 an IRC operator of type %s", user->nick, type.c_str()); - + + ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), type.c_str()); + user->WriteNumeric(381, "%s :You are now %s %s",user->nick.c_str(), 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; } } @@ -254,38 +319,11 @@ public: return false; } - virtual ~ModuleSQLOper() - { - } - virtual Version GetVersion() { - return Version(1,1,1,0,VF_VENDOR,API_VERSION); + return Version(1,2,1,0,VF_VENDOR,API_VERSION); } }; -class ModuleSQLOperFactory : public ModuleFactory -{ - public: - ModuleSQLOperFactory() - { - } - - ~ModuleSQLOperFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSQLOper(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleSQLOperFactory; -} - +MODULE_INIT(ModuleSQLOper)