X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqloper.cpp;h=02ce959f6baf928423fd0b0bf72818b6d4ca8607;hb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;hp=bc506f917f7e459dc264a5416206ed0896231770;hpb=420787dcab5e875ecf5eb27992a6e65eaf267438;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp index bc506f917..02ce959f6 100644 --- a/src/modules/extra/m_sqloper.cpp +++ b/src/modules/extra/m_sqloper.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -11,15 +11,15 @@ * --------------------------------------------------- */ -#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 */ @@ -27,43 +27,48 @@ class ModuleSQLOper : public Module { - InspIRCd* Srv; Module* SQLutils; + Module* HashModule; std::string databaseid; public: ModuleSQLOper(InspIRCd* Me) - : Module::Module(Me), Srv(Me) + : Module::Module(Me) { - ServerInstance->UseInterface("SQLutils"); - ServerInstance->UseInterface("SQL"); + 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."); - SQLutils = ServerInstance->FindModule("m_sqlutils.so"); + 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 }; + ServerInstance->Modules->Attach(eventlist, this, 3); } virtual ~ModuleSQLOper() { - ServerInstance->DoneWithInterface("SQL"); - ServerInstance->DoneWithInterface("SQLutils"); + ServerInstance->Modules->DoneWithInterface("SQL"); + ServerInstance->Modules->DoneWithInterface("SQLutils"); + ServerInstance->Modules->DoneWithInterface("HashRequest"); } - void Implements(char* List) - { - List[I_OnRequest] = List[I_OnRehash] = List[I_OnPreCommand] = 1; - } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { - ConfigReader Conf(Srv); + 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) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { if ((validated) && (command == "OPER")) { @@ -80,27 +85,35 @@ public: 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); + /* 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 = 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())); @@ -110,8 +123,6 @@ public: } else { - ServerInstance->Log(DEBUG, "SQLrequest failed: %s", req.error.Str()); - return false; } } @@ -126,13 +137,9 @@ public: { 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; @@ -144,10 +151,7 @@ public: 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.. @@ -164,9 +168,7 @@ 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 */ @@ -204,8 +206,6 @@ 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); @@ -217,22 +217,16 @@ public: } } - 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 &username, const std::string &pass) + void LoginFail(User* user, const std::string &username, const std::string &pass) { - command_t* oper_command = ServerInstance->Parser->GetHandler("OPER"); + Command* oper_command = ServerInstance->Parser->GetHandler("OPER"); if (oper_command) { @@ -241,39 +235,35 @@ public: } else { - ServerInstance->Log(DEBUG, "WHAT?! Why do we have no OPER command?!"); + 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) + 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, 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; } } @@ -288,27 +278,4 @@ public: }; -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)