X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqloper.cpp;h=52a73eba90963d8ea121f2ede0ea848a79a6e399;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=861a2b70c40d59ef3f3369739d42dd18f110e2e6;hpb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp index 861a2b70c..52a73eba9 100644 --- a/src/modules/extra/m_sqloper.cpp +++ b/src/modules/extra/m_sqloper.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 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. @@ -12,11 +12,6 @@ */ #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" @@ -34,17 +29,17 @@ class ModuleSQLOper : public Module irc::string hashtype; hashymodules hashers; bool diduseiface; - std::deque names; + parameterlist names; public: ModuleSQLOper(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { ServerInstance->Modules->UseInterface("SQLutils"); ServerInstance->Modules->UseInterface("SQL"); ServerInstance->Modules->UseInterface("HashRequest"); - OnRehash(NULL, ""); + OnRehash(NULL); diduseiface = false; @@ -78,6 +73,20 @@ public: 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")) @@ -103,20 +112,20 @@ public: } - 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 std::vector ¶meters, User *user, bool validated, const std::string &original_line) + virtual int OnPreCommand(std::string &command, std::vector ¶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 @@ -131,7 +140,7 @@ public: bool LookupOper(User* user, const std::string &username, const std::string &password) { Module* target; - + target = ServerInstance->Modules->FindFeature("SQL"); if (target) @@ -150,7 +159,7 @@ public: */ 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, @@ -164,7 +173,7 @@ public: user->Extend("oper_user", strdup(username.c_str())); user->Extend("oper_pass", strdup(password.c_str())); - + return true; } else @@ -178,7 +187,7 @@ public: return false; } } - + virtual const char* OnRequest(Request* request) { if (strcmp(SQLRESID, request->GetId()) == 0) @@ -193,29 +202,29 @@ public: 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; @@ -263,7 +272,7 @@ public: } } - + return SQLSUCCESS; } @@ -287,17 +296,17 @@ public: } } - 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. */ @@ -306,24 +315,19 @@ public: 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->WriteNumeric(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, tname); - + user->Oper(type, tname); return true; } } - + return false; } virtual Version GetVersion() { - return Version(1,2,1,0,VF_VENDOR,API_VERSION); + return Version("$Id$", VF_VENDOR, API_VERSION); } - + }; MODULE_INIT(ModuleSQLOper)