X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqloper.cpp;h=520869e210b3074d1fa02ffe3f6f0a34a7a19d24;hb=d556a4f8740b65e635ff7d2b976faaedbdac51d4;hp=9a2422aa875d18e5a2b1c7ed9c62431f795e0546;hpb=b37a253d962ed7af1ea7a328abf2a1af74f30759;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp index 9a2422aa8..520869e21 100644 --- a/src/modules/extra/m_sqloper.cpp +++ b/src/modules/extra/m_sqloper.cpp @@ -2,64 +2,60 @@ * | 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-2007 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. * * --------------------------------------------------- */ -#include - +#include "inspircd.h" #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 */ - -extern InspIRCd* ServerInstance; +/* $ModDep: m_sqlv2.h m_sqlutils.h */ class ModuleSQLOper : public Module { - Server* Srv; Module* SQLutils; + Module* HashModule; std::string databaseid; public: ModuleSQLOper(InspIRCd* Me) - : Module::Module(Me) + : Module::Module(Me) { - SQLutils = ServerInstance->FindFeature("SQLutils"); - - if (SQLutils) - { - log(DEBUG, "Successfully got SQLutils pointer"); - } - else - { - 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."); - } - - OnRehash(""); + ServerInstance->UseInterface("SQLutils"); + ServerInstance->UseInterface("SQL"); + ServerInstance->UseInterface("HashRequest"); + + /* Attempt to locate the md5 service provider, bail if we can't find it */ + HashModule = ServerInstance->FindModule("m_md5.so"); + if (!HashModule) + throw ModuleException("Can't find m_md5.so. Please load m_md5.so before m_sqloper.so."); + + SQLutils = ServerInstance->FindModule("m_sqlutils.so"); + if (!SQLutils) + throw ModuleException("Can't find m_sqlutils.so. Please load m_sqlutils.so before m_sqloper.so."); + + OnRehash(NULL,""); } - virtual void OnRehash(const std::string ¶meter) + virtual ~ModuleSQLOper() { - ConfigReader Conf; - - databaseid = Conf.ReadValue("sqloper", "dbid", 0); /* Database ID of a database configured for the service provider module */ + ServerInstance->DoneWithInterface("SQL"); + ServerInstance->DoneWithInterface("SQLutils"); + ServerInstance->DoneWithInterface("HashRequest"); } void Implements(char* List) @@ -67,19 +63,27 @@ public: List[I_OnRequest] = List[I_OnRehash] = List[I_OnPreCommand] = 1; } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated) + virtual void OnRehash(userrec* user, const std::string ¶meter) { - if (validated && (command == "OPER")) + ConfigReader Conf(ServerInstance); + + databaseid = Conf.ReadValue("sqloper", "dbid", 0); /* Database ID of a database configured for the service provider module */ + } + + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *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 + * for /oper by calling its Handle method directly. */ return 1; } } - return 0; } @@ -88,10 +92,19 @@ public: Module* target; target = ServerInstance->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); + /* Reset hash module first back to MD5 standard state */ + HashResetRequest(this, HashModule).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(); + + /* We generate our own MD5 sum here because some database providers (e.g. SQLite) dont have a builtin md5 function, + * also hashing it in the module and only passing a remote query containing a hash is more secure. + */ + + 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()) { @@ -102,22 +115,21 @@ public: * 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->Log(SPARSE, "WARNING: Couldn't find SQL provider module. NOBODY will be able to oper up unless their o:line is statically configured"); return false; } } @@ -126,22 +138,21 @@ public: { if (strcmp(SQLRESID, request->GetId()) == 0) { - SQLresult* res; - - res = static_cast(request); - - log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetId(), res->id); - + SQLresult* res = static_cast(request); + userrec* 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) - { - 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()) { /* We got a row in the result, this means there was a record for the oper.. @@ -158,14 +169,20 @@ public: */ 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/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 @@ -174,10 +191,14 @@ public: * we should have already checked the o:lines so now we need an * "insufficient awesomeness" (invalid credentials) error */ - - user->WriteServ( "491 %s :Invalid oper credentials", user->nick); - ServerInstance->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 @@ -186,55 +207,64 @@ public: * 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"); + } - user->WriteServ( "491 %s :Invalid oper credentials", user->nick); - ServerInstance->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->GetId()); - + return NULL; - } + } + + void LoginFail(userrec* user, const std::string &username, const std::string &pass) + { + command_t* oper_command = ServerInstance->Parser->GetHandler("OPER"); + + if (oper_command) + { + const char* params[] = { username.c_str(), pass.c_str() }; + oper_command->Handle(params, 2, user); + } + else + { + ServerInstance->Log(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) { - ConfigReader Conf; + 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(), user->GetIPString(), pattern.c_str())) { /* Opertype and host match, looks like this is it. */ - 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()); - - ServerInstance->WriteOpers("*** %s (%s@%s) is now an IRC operator of type %s", user->nick, user->ident, user->host, type.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 an IRC operator of type %s", user->nick, type.c_str()); - + if (!user->modes[UM_OPERATOR]) user->Oper(type); - + return true; } } @@ -242,37 +272,12 @@ public: return false; } - virtual ~ModuleSQLOper() - { - } - virtual Version GetVersion() { - return Version(1,0,1,0,VF_VENDOR); - } - -}; - -class ModuleSQLOperFactory : public ModuleFactory -{ - public: - ModuleSQLOperFactory() - { - } - - ~ModuleSQLOperFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSQLOper(Me); + return Version(1,1,1,0,VF_VENDOR,API_VERSION); } }; +MODULE_INIT(ModuleSQLOper); -extern "C" void * init_module( void ) -{ - return new ModuleSQLOperFactory; -}