X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqllog.cpp;h=401db811c8623a8a3f53491ddcaaf56f2f24f449;hb=80af129f5275b707c58537b8044d991a0c7e01d3;hp=55a74152bc4b90502397b93856f90a1d4b506464;hpb=7c34ada2501a62b3f9256f090526de1d95804cc5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp index 55a74152b..401db811c 100644 --- a/src/modules/extra/m_sqllog.cpp +++ b/src/modules/extra/m_sqllog.cpp @@ -2,35 +2,19 @@ * | 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. + * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "users.h" #include "channels.h" #include "modules.h" +#include "configreader.h" #include "inspircd.h" #include "m_sqlv2.h" @@ -38,11 +22,10 @@ using namespace std; static Module* SQLModule; static Module* MyMod; static std::string dbid; -extern time_t TIME; enum LogTypes { LT_OPER = 1, LT_KILL, LT_SERVLINK, LT_XLINE, LT_CONNECT, LT_DISCONNECT, LT_FLOOD, LT_LOADMODULE }; -enum QueryState { FIND_SOURCE, INSERT_SOURCE, FIND_NICK, INSERT_NICK, FIND_HOST, INSERT_HOST, INSERT_LOGENTRY, DONE }; +enum QueryState { FIND_SOURCE, FIND_NICK, FIND_HOST, DONE}; class QueryInfo; @@ -50,171 +33,141 @@ std::map active_queries; class QueryInfo { - public: +public: QueryState qs; unsigned long id; std::string nick; + std::string source; std::string hostname; int sourceid; int nickid; int hostid; int category; time_t date; + bool insert; - QueryInfo(const std::string &n, const std::string &h, unsigned long i, int cat) + QueryInfo(const std::string &n, const std::string &s, const std::string &h, unsigned long i, int cat) { qs = FIND_SOURCE; nick = n; + source = s; hostname = h; id = i; category = cat; sourceid = nickid = hostid = -1; - date = TIME; + date = time(NULL); + insert = false; } void Go(SQLresult* res) { - // Nothing here and not sent yet SQLrequest req = SQLreq(MyMod, SQLModule, dbid, "", ""); - - log(DEBUG,"State: %d",qs); - switch (qs) { case FIND_SOURCE: - // "SELECT id,actor FROM ircd_log_actors WHERE actor='"+nick+"'" - // If we find it, advance to FIND_NICK state, otherwise go to INSERT_SOURCE - if (res->Rows()) - { - qs = INSERT_SOURCE; - } - else + if (res->Rows() && sourceid == -1 && !insert) { + sourceid = atoi(res->GetValue(0,0).d.c_str()); req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", nick); if(req.Send()) { - qs = FIND_SOURCE; + insert = false; + qs = FIND_NICK; active_queries[req.id] = this; } - else - { - log(DEBUG, "SQLrequest failed: %s", req.error.Str()); - } - break; - } - case INSERT_SOURCE: - // "INSERT INTO ircd_log_actors VALUES('','"+nick+"')") - // after we've done this, go back to FIND_SOURCE - req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log_actors VALUES('','?')", nick); - if(req.Send()) + else if (res->Rows() && sourceid == -1 && insert) { - qs = FIND_NICK; - active_queries[req.id] = this; + req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", source); + if(req.Send()) + { + insert = false; + qs = FIND_SOURCE; + active_queries[req.id] = this; + } } else { - log(DEBUG, "SQLrequest failed: %s", req.error.Str()); + req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log_actors (actor) VALUES('?')", source); + if(req.Send()) + { + insert = true; + qs = FIND_SOURCE; + active_queries[req.id] = this; + } } - break; + case FIND_NICK: - // "SELECT id,actor FROM ircd_log_actors WHERE actor='"+nick+"'" - // If we find it, advance to FIND_HOST state, otherwise go to INSERT_NICK - if (res->Rows()) + if (res->Rows() && nickid == -1 && !insert) { - qs = INSERT_NICK; + nickid = atoi(res->GetValue(0,0).d.c_str()); + req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'", hostname); + if(req.Send()) + { + insert = false; + qs = FIND_HOST; + active_queries[req.id] = this; + } } - else + else if (res->Rows() && nickid == -1 && insert) { req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", nick); if(req.Send()) { + insert = false; qs = FIND_NICK; active_queries[req.id] = this; } - else - { - log(DEBUG, "SQLrequest failed: %s", req.error.Str()); - } - break; - } - case INSERT_NICK: - // "INSERT INTO ircd_log_actors VALUES('','"+nick+"')") - // after we've done this, go back to FIND_NICK - req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log_actors VALUES('','?')",nick); - if(req.Send()) - { - qs = FIND_HOST; - active_queries[req.id] = this; } else { - log(DEBUG, "SQLrequest failed: %s", req.error.Str()); + req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log_actors (actor) VALUES('?')",nick); + if(req.Send()) + { + insert = true; + qs = FIND_NICK; + active_queries[req.id] = this; + } } break; + case FIND_HOST: - // "SELECT id,hostname FROM ircd_log_hosts WHERE hostname='"+host+"'" - // If we find it, advance to INSERT_LOGENTRY state, otherwise go to INSERT_HOST - if (res->Rows()) + if (res->Rows() && hostid == -1 && !insert) { - qs = INSERT_HOST; + hostid = atoi(res->GetValue(0,0).d.c_str()); + req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log (category_id,nick,host,source,dtime) VALUES("+ConvToStr(category)+","+ConvToStr(nickid)+","+ConvToStr(hostid)+","+ConvToStr(sourceid)+","+ConvToStr(date)+")"); + if(req.Send()) + { + insert = true; + qs = DONE; + active_queries[req.id] = this; + } } - else + else if (res->Rows() && hostid == -1 && insert) { - req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'",hostname); + req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'", hostname); if(req.Send()) { + insert = false; qs = FIND_HOST; active_queries[req.id] = this; } - else - { - log(DEBUG, "SQLrequest failed: %s", req.error.Str()); - } - break; - } - case INSERT_HOST: - // "INSERT INTO ircd_log_hosts VALUES('','"+host+"')" - // after we've done this, go back to FIND_HOST - req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log_hosts VALUES('','?')", hostname); - if(req.Send()) - { - qs = INSERT_LOGENTRY; - active_queries[req.id] = this; - } - else - { - log(DEBUG, "SQLrequest failed: %s", req.error.Str()); - } - break; - case INSERT_LOGENTRY: - // INSERT INTO ircd_log VALUES('',%lu,%lu,%lu,%lu,%lu)",(unsigned long)category,(unsigned long)nickid,(unsigned long)hostid,(unsigned long)sourceid,(unsigned long)date - // aaand done! (discard result) - if ((nickid == -1) || (hostid == -1) || (sourceid == -1)) - { - qs = FIND_SOURCE; - this->Go(res); } else { - req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log VALUES('',"+ConvToStr(category)+","+ConvToStr(nickid)+","+ConvToStr(hostid)+","+ConvToStr(sourceid)+","+ConvToStr(date)+")"); - /*,category, - nickid, - hostid, - sourceid, - date);*/ + req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log_hosts (hostname) VALUES('?')", hostname); if(req.Send()) { - qs = DONE; - } - else - { - log(DEBUG, "SQLrequest failed: %s", req.error.Str()); + insert = true; + qs = FIND_HOST; + active_queries[req.id] = this; } } break; + case DONE: + delete active_queries[req.id]; active_queries[req.id] = NULL; break; } @@ -225,36 +178,46 @@ class QueryInfo class ModuleSQLLog : public Module { - Server* Srv; + InspIRCd* Srv; ConfigReader* Conf; public: - bool ReadConfig() + ModuleSQLLog(InspIRCd* Me) + : Module::Module(Me), Srv(Me) { - Conf = new ConfigReader(); - dbid = Conf->ReadValue("sqllog","dbid",0); // database id of a database configured in sql module - DELETE(Conf); + ServerInstance->UseInterface("SQLutils"); + ServerInstance->UseInterface("SQL"); + + Module* SQLutils = ServerInstance->FindModule("m_sqlutils.so"); + if (!SQLutils) + throw ModuleException("Can't find m_sqlutils.so. Please load m_sqlutils.so before m_sqlauth.so."); + SQLModule = Srv->FindFeature("SQL"); - if (!SQLModule) - Srv->Log(DEFAULT,"WARNING: m_sqllog.so could not initialize because an SQL module is not loaded. Load the module and rehash your server."); - return (SQLModule); - } - ModuleSQLLog(Server* Me) : Module::Module(Me) - { - Srv = Me; - ReadConfig(); + OnRehash(""); MyMod = this; active_queries.clear(); } + virtual ~ModuleSQLLog() + { + ServerInstance->DoneWithInterface("SQL"); + ServerInstance->DoneWithInterface("SQLutils"); + } + void Implements(char* List) { List[I_OnRehash] = List[I_OnOper] = List[I_OnGlobalOper] = List[I_OnKill] = 1; - List[I_OnPreCommand] = List[I_OnUserConnect] = List[I_OnGlobalConnect] = 1; + List[I_OnPreCommand] = List[I_OnUserConnect] = 1; List[I_OnUserQuit] = List[I_OnLoadModule] = List[I_OnRequest] = 1; } + void ReadConfig() + { + ConfigReader Conf(Srv); + dbid = Conf.ReadValue("sqllog","dbid",0); // database id of a database configured in sql module + } + virtual void OnRehash(const std::string ¶meter) { ReadConfig(); @@ -262,26 +225,31 @@ class ModuleSQLLog : public Module virtual char* OnRequest(Request* request) { - if(strcmp(SQLRESID, request->GetData()) == 0) + if(strcmp(SQLRESID, request->GetId()) == 0) { SQLresult* res; std::map::iterator n; res = static_cast(request); - log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetData(), res->id); + ServerInstance->Log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetId(), res->id); n = active_queries.find(res->id); if (n != active_queries.end()) { - log(DEBUG,"This is an active query"); + ServerInstance->Log(DEBUG,"This is an active query"); n->second->Go(res); std::map::iterator n = active_queries.find(res->id); active_queries.erase(n); } + + return SQLSUCCESS; } - return SQLSUCCESS; + + ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId()); + + return NULL; } void AddLogEntry(int category, const std::string &nick, const std::string &host, const std::string &source) @@ -290,22 +258,18 @@ class ModuleSQLLog : public Module if (!SQLModule) return; - SQLrequest req = SQLreq(this, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", nick); + SQLrequest req = SQLreq(this, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", source); if(req.Send()) { - QueryInfo* i = new QueryInfo(nick, host, req.id, category); + QueryInfo* i = new QueryInfo(nick, source, host, req.id, category); i->qs = FIND_SOURCE; active_queries[req.id] = i; + ServerInstance->Log(DEBUG,"Active query id %d",req.id); } else { - log(DEBUG, "SQLrequest failed: %s", req.error.Str()); + ServerInstance->Log(DEBUG, "SQLrequest failed: %s", req.error.Str()); } - - /*long nickid = InsertNick(nick); - long sourceid = InsertNick(source); - long hostid = InsertHost(host); - InsertEntry((unsigned)category,(unsigned)nickid,(unsigned)hostid,(unsigned)sourceid,(unsigned long)time(NULL));*/ } virtual void OnOper(userrec* user, const std::string &opertype) @@ -324,9 +288,9 @@ class ModuleSQLLog : public Module return 0; } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) { - if ((command == "GLINE") || (command == "KLINE") || (command == "ELINE") || (command == "ZLINE")) + if ((command == "GLINE" || command == "KLINE" || command == "ELINE" || command == "ZLINE") && validated) { AddLogEntry(LT_XLINE,user->nick,command[0]+std::string(":")+std::string(parameters[0]),user->server); } @@ -338,11 +302,6 @@ class ModuleSQLLog : public Module AddLogEntry(LT_CONNECT,user->nick,user->host,user->server); } - virtual void OnGlobalConnect(userrec* user) - { - AddLogEntry(LT_CONNECT,user->nick,user->host,user->server); - } - virtual void OnUserQuit(userrec* user, const std::string &reason) { AddLogEntry(LT_DISCONNECT,user->nick,user->host,user->server); @@ -350,16 +309,12 @@ class ModuleSQLLog : public Module virtual void OnLoadModule(Module* mod, const std::string &name) { - AddLogEntry(LT_LOADMODULE,name,Srv->GetServerName(),Srv->GetServerName()); + AddLogEntry(LT_LOADMODULE,name,Srv->Config->ServerName, Srv->Config->ServerName); } - virtual ~ModuleSQLLog() - { - } - virtual Version GetVersion() { - return Version(1,0,0,1,VF_VENDOR); + return Version(1,1,0,1,VF_VENDOR,API_VERSION); } }; @@ -375,7 +330,7 @@ class ModuleSQLLogFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleSQLLog(Me); } @@ -387,4 +342,3 @@ extern "C" void * init_module( void ) { return new ModuleSQLLogFactory; } -