X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqlauth.cpp;h=98b0227e5ad3157927e4dac3ace89fdab33c6bc3;hb=2e1f86fd0c9911210b79e6ac346672441eef18c4;hp=17381731ba5897ed709a931c661f928fe7bafe38;hpb=559d2719a37d22584dbdc2b5165ed0f7236f26f4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp index 17381731b..98b0227e5 100644 --- a/src/modules/extra/m_sqlauth.cpp +++ b/src/modules/extra/m_sqlauth.cpp @@ -2,36 +2,29 @@ * | 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 - +#include "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" -#include "inspircd.h" -#include "helperfuncs.h" #include "m_sqlv2.h" +#include "m_sqlutils.h" /* $ModDesc: Allow/Deny connections based upon an arbitary SQL table */ - -typedef std::map QueryUserMap; +/* $ModDep: m_sqlv2.h m_sqlutils.h */ class ModuleSQLAuth : public Module { - Server* Srv; + Module* SQLutils; + Module* SQLprovider; std::string usertable; std::string userfield; @@ -43,14 +36,28 @@ class ModuleSQLAuth : public Module bool verbose; - QueryUserMap qumap; - public: - ModuleSQLAuth(Server* Me) + ModuleSQLAuth(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; - OnRehash(""); + ServerInstance->Modules->UseInterface("SQLutils"); + ServerInstance->Modules->UseInterface("SQL"); + + SQLutils = ServerInstance->Modules->Find("m_sqlutils.so"); + if (!SQLutils) + throw ModuleException("Can't find m_sqlutils.so. Please load m_sqlutils.so before m_sqlauth.so."); + + SQLprovider = ServerInstance->Modules->FindFeature("SQL"); + if (!SQLprovider) + throw ModuleException("Can't find an SQL provider module. Please load one before attempting to load m_sqlauth."); + + OnRehash(NULL,""); + } + + virtual ~ModuleSQLAuth() + { + ServerInstance->Modules->DoneWithInterface("SQL"); + ServerInstance->Modules->DoneWithInterface("SQLutils"); } void Implements(char* List) @@ -58,9 +65,9 @@ public: List[I_OnUserDisconnect] = List[I_OnCheckReady] = List[I_OnRequest] = List[I_OnRehash] = List[I_OnUserRegister] = 1; } - virtual void OnRehash(const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { - ConfigReader Conf; + ConfigReader Conf(ServerInstance); usertable = Conf.ReadValue("sqlauth", "usertable", 0); /* User table name */ databaseid = Conf.ReadValue("sqlauth", "dbid", 0); /* Database ID, given to the SQL service provider */ @@ -79,196 +86,108 @@ public: } } - virtual void OnUserRegister(userrec* user) + virtual int OnUserRegister(User* user) { - if ((allowpattern != "") && (Srv->MatchText(user->nick,allowpattern))) - return; + if ((!allowpattern.empty()) && (ServerInstance->MatchText(user->nick,allowpattern))) + { + user->Extend("sqlauthed"); + return 0; + } if (!CheckCredentials(user)) { - if (verbose) - WriteOpers("Forbidden connection from %s!%s@%s (invalid login/password)",user->nick,user->ident,user->host); - Srv->QuitUser(user,killreason); + User::QuitUser(ServerInstance,user,killreason); + return 1; } + return 0; } - bool CheckCredentials(userrec* user) + bool CheckCredentials(User* user) { - bool found; - Module* target; - - found = false; - target = Srv->FindFeature("SQL"); - - if(target) - { - SQLrequest req = SQLreq(this, target, databaseid, "SELECT ? FROM ? WHERE ? = '?' AND ? = ?'?')", userfield, usertable, userfield, user->nick, passfield, encryption, user->password); + SQLrequest req = SQLreq(this, SQLprovider, databaseid, "SELECT ? FROM ? WHERE ? = '?' AND ? = ?'?')", userfield, usertable, userfield, user->nick, passfield, encryption, user->password); - 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 - * so we insert it into a map mapping the IDs to users. - * This isn't quite enough though, as if the user quit while the query was in progress then when the result - * came to be processed we'd get an invalid userrec* out of the map. Now we *could* solve this by watching - * OnUserDisconnect() and iterating the map every time someone quits to make sure they didn't have any queries - * in progress, but that would be relatively slow and inefficient. Instead (thanks to w00t ;p) we attach a list - * of query IDs associated with it to the userrec, so in OnUserDisconnect() we can remove it immediately. - */ - log(DEBUG, "Sent query, got given ID %lu", req.id); - qumap.insert(std::make_pair(req.id, user)); - - if(!user->Extend("sqlauth_queryid", new unsigned long(req.id))) - { - log(DEBUG, "BUG: user being sqlauth'd already extended with 'sqlauth_queryid' :/"); - } - - return true; - } - else - { - log(DEBUG, "SQLrequest failed: %s", req.error.Str()); - - if (verbose) - WriteOpers("Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick, user->ident, user->host, req.error.Str()); + 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 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. + */ + AssociateUser(this, SQLutils, req.id, user).Send(); - return false; - } + return true; } else { - log(SPARSE, "WARNING: Couldn't find SQL provider module. NOBODY will be allowed to connect until it comes back unless they match an exception"); + if (verbose) + ServerInstance->WriteOpers("Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick, user->ident, user->host, req.error.Str()); return false; } } virtual char* OnRequest(Request* request) { - if(strcmp(SQLRESID, request->GetData()) == 0) + if(strcmp(SQLRESID, request->GetId()) == 0) { - SQLresult* res; - QueryUserMap::iterator iter; - - res = static_cast(request); - - log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetData(), res->id); - - iter = qumap.find(res->id); + SQLresult* res = static_cast(request); + + User* user = GetAssocUser(this, SQLutils, res->id).S().user; + UnAssociate(this, SQLutils, res->id).S(); - if(iter != qumap.end()) + if(user) { - userrec* user; - unsigned long* id; - - user = iter->second; - - 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() == NO_ERROR) { - /* We got a row in the result, this is enough really */ - user->Extend("sqlauthed"); + if(res->Rows()) + { + /* We got a row in the result, this is enough really */ + user->Extend("sqlauthed"); + } + else if (verbose) + { + /* No rows in result, this means there was no record matching the user */ + ServerInstance->WriteOpers("Forbidden connection from %s!%s@%s (SQL query returned no matches)", user->nick, user->ident, user->host); + user->Extend("sqlauth_failed"); + } } else if (verbose) { - /* No rows in result, this means there was no record matching the user */ - WriteOpers("Forbidden connection from %s!%s@%s (SQL query returned no matches)", user->nick, user->ident, user->host); - } - - /* Remove our ID from the lookup table to keep it as small and neat as possible */ - qumap.erase(iter); - - /* Cleanup the userrec, no point leaving this here */ - if(user->GetExt("sqlauth_queryid", id)) - { - user->Shrink("sqlauth_queryid"); - delete id; + ServerInstance->WriteOpers("Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick, user->ident, user->host, res->error.Str()); + user->Extend("sqlauth_failed"); } } else { - log(DEBUG, "Got query with unknown ID, this probably means the user quit while the query was in progress"); + return NULL; + } + + if (!user->GetExt("sqlauthed")) + { + User::QuitUser(ServerInstance,user,killreason); } - return SQLSUCCESS; - } - - log(DEBUG, "Got unsupported API version string: %s", request->GetData()); - + } return NULL; } - virtual void OnUserDisconnect(userrec* user) + virtual void OnUserDisconnect(User* user) { - unsigned long* id; - - if(user->GetExt("sqlauth_queryid", id)) - { - QueryUserMap::iterator iter; - - iter = qumap.find(*id); - - if(iter != qumap.end()) - { - if(iter->second == user) - { - qumap.erase(iter); - - log(DEBUG, "Erased query from map associated with quitting user %s", user->nick); - } - else - { - log(DEBUG, "BUG: ID associated with user %s doesn't have the same userrec* associated with it in the map"); - } - } - else - { - log(DEBUG, "BUG: user %s was extended with sqlauth_queryid but there was nothing matching in the map", user->nick); - } - - user->Shrink("sqlauth_queryid"); - delete id; - } + user->Shrink("sqlauthed"); + user->Shrink("sqlauth_failed"); } - virtual bool OnCheckReady(userrec* user) + virtual bool OnCheckReady(User* user) { return user->GetExt("sqlauthed"); } - virtual ~ModuleSQLAuth() - { - } - virtual Version GetVersion() { - return Version(1,0,1,0,VF_VENDOR); - } - -}; - -class ModuleSQLAuthFactory : public ModuleFactory -{ - public: - ModuleSQLAuthFactory() - { - } - - ~ModuleSQLAuthFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleSQLAuth(Me); + return Version(1,1,1,0,VF_VENDOR,API_VERSION); } }; - -extern "C" void * init_module( void ) -{ - return new ModuleSQLAuthFactory; -} +MODULE_INIT(ModuleSQLAuth)