X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqllog.cpp;h=556cc8b31c33f04bd2ee806571b67213de21b392;hb=7d93921aabd9c608821baec8a871aff844dfae49;hp=84dd8fa4344a34c14e9fe98164e028ec296dc17e;hpb=5d407fb44c759524881712a80febb86b4506ddbf;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp index 84dd8fa43..556cc8b31 100644 --- a/src/modules/extra/m_sqllog.cpp +++ b/src/modules/extra/m_sqllog.cpp @@ -2,201 +2,246 @@ * | 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-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * * This program is free but copyrighted software; see * 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 "inspircd.h" -#include "m_sql.h" +#include "m_sqlv2.h" + +static Module* SQLModule; +static Module* MyMod; +static std::string dbid; enum LogTypes { LT_OPER = 1, LT_KILL, LT_SERVLINK, LT_XLINE, LT_CONNECT, LT_DISCONNECT, LT_FLOOD, LT_LOADMODULE }; -/* $ModDesc: Logs network-wide data to an SQL database */ +enum QueryState { FIND_SOURCE, FIND_NICK, FIND_HOST, DONE}; -class ModuleSQLLog : public Module +class QueryInfo; + +std::map active_queries; + +class QueryInfo { - Server* Srv; - ConfigReader* Conf; - unsigned long dbid; - Module* SQLModule; +private: + InspIRCd* ServerInstance; +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; - public: - bool ReadConfig() + QueryInfo(InspIRCd* Instance, const std::string &n, const std::string &s, const std::string &h, unsigned long i, int cat) { - Conf = new ConfigReader(); - dbid = Conf->ReadInteger("sqllog","dbid",0,true); // database id of a database configured in m_sql (see m_sql config) - DELETE(Conf); - SQLModule = Srv->FindModule("m_sql.so"); - if (!SQLModule) - Srv->Log(DEFAULT,"WARNING: m_SQLLog.so could not initialize because m_sql.so is not loaded. Load the module and rehash your server."); - return (SQLModule); + ServerInstance = Instance; + qs = FIND_SOURCE; + nick = n; + source = s; + hostname = h; + id = i; + category = cat; + sourceid = nickid = hostid = -1; + date = ServerInstance->Time(); + insert = false; } - ModuleSQLLog(Server* Me) : Module::Module(Me) + void Go(SQLresult* res) { - Srv = Me; - ReadConfig(); + SQLrequest req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("")); + switch (qs) + { + case FIND_SOURCE: + if (res->Rows() && sourceid == -1 && !insert) + { + sourceid = atoi(res->GetValue(0,0).d.c_str()); + req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("SELECT id,actor FROM ircd_log_actors WHERE actor='?'") % nick); + if(req.Send()) + { + insert = false; + qs = FIND_NICK; + active_queries[req.id] = this; + } + } + else if (res->Rows() && sourceid == -1 && insert) + { + req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("SELECT id,actor FROM ircd_log_actors WHERE actor='?'") % source); + if(req.Send()) + { + insert = false; + qs = FIND_SOURCE; + active_queries[req.id] = this; + } + } + else + { + req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("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: + if (res->Rows() && nickid == -1 && !insert) + { + nickid = atoi(res->GetValue(0,0).d.c_str()); + req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'") % hostname); + if(req.Send()) + { + insert = false; + qs = FIND_HOST; + active_queries[req.id] = this; + } + } + else if (res->Rows() && nickid == -1 && insert) + { + req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("SELECT id,actor FROM ircd_log_actors WHERE actor='?'") % nick); + if(req.Send()) + { + insert = false; + qs = FIND_NICK; + active_queries[req.id] = this; + } + } + else + { + req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("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: + if (res->Rows() && hostid == -1 && !insert) + { + hostid = atoi(res->GetValue(0,0).d.c_str()); + req = SQLrequest(MyMod, SQLModule, dbid, + SQLquery("INSERT INTO ircd_log (category_id,nick,host,source,dtime) VALUES('?','?','?','?','?')") % category % nickid % hostid % sourceid % date); + if(req.Send()) + { + insert = true; + qs = DONE; + active_queries[req.id] = this; + } + } + else if (res->Rows() && hostid == -1 && insert) + { + req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'") % hostname); + if(req.Send()) + { + insert = false; + qs = FIND_HOST; + active_queries[req.id] = this; + } + } + else + { + req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("INSERT INTO ircd_log_hosts (hostname) VALUES('?')") % hostname); + if(req.Send()) + { + insert = true; + qs = FIND_HOST; + active_queries[req.id] = this; + } + } + break; + + case DONE: + std::map::iterator x = active_queries.find(req.id); + if (x != active_queries.end()) + { + delete x->second; + active_queries.erase(x); + } + break; + } } +}; + +/* $ModDesc: Logs network-wide data to an SQL database */ - void Implements(char* List) +class ModuleSQLLog : public Module +{ + + public: + ModuleSQLLog(InspIRCd* Me) + : Module(Me) { - 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_OnUserQuit] = List[I_OnLoadModule] = 1; + ServerInstance->Modules->UseInterface("SQLutils"); + ServerInstance->Modules->UseInterface("SQL"); + + Module* 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."); + + SQLModule = ServerInstance->Modules->FindFeature("SQL"); + + OnRehash(NULL); + MyMod = this; + active_queries.clear(); + + Implementation eventlist[] = { I_OnRehash, I_OnOper, I_OnGlobalOper, I_OnKill, + I_OnPreCommand, I_OnUserConnect, I_OnUserQuit, I_OnLoadModule, I_OnRequest }; + ServerInstance->Modules->Attach(eventlist, this, 9); } - virtual void OnRehash(const std::string ¶meter) + virtual ~ModuleSQLLog() { - ReadConfig(); + ServerInstance->Modules->DoneWithInterface("SQL"); + ServerInstance->Modules->DoneWithInterface("SQLutils"); } - long InsertNick(const std::string &nick) + + void ReadConfig() { - long nid = -1; - - SQLRequest* query = new SQLRequest(SQL_RESULT,dbid,"SELECT id,actor FROM ircd_log_actors WHERE actor='"+nick+"'"); - Request queryrequest((char*)query, this, SQLModule); - SQLResult* result = (SQLResult*)queryrequest.Send(); - - if (result->GetType() == SQL_OK) - { - SQLRequest* rowrequest = new SQLRequest(SQL_ROW,dbid,""); - Request rowquery((char*)rowrequest, this, SQLModule); - SQLResult* rowresult = (SQLResult*)rowquery.Send(); - - if (rowresult->GetType() == SQL_ROW) - { - nid = atoi(rowresult->GetField("id").c_str()); - DELETE(rowresult); - } - - DELETE(rowrequest); - DELETE(result); - } - - query->SetQueryType(SQL_DONE); - query->SetConnID(dbid); - Request donerequest((char*)query, this, SQLModule); - donerequest.Send(); - DELETE(query); - - if (nid < 1) - { - SQLRequest* query2 = new SQLRequest(SQL_COUNT,dbid,"INSERT INTO ircd_log_actors VALUES('','"+nick+"')"); - Request queryrequest2((char*)query2, this, SQLModule); - SQLResult* result2 = (SQLResult*)queryrequest2.Send(); - - if (result2->GetType() == SQL_ERROR) - { - Srv->Log(DEFAULT,"SQL log error: " + result2->GetError()); - } - - if (result2) - DELETE(result); - if (query2) - DELETE(query2); - - nid = InsertNick(nick); - } - return nid; + ConfigReader Conf(ServerInstance); + dbid = Conf.ReadValue("sqllog","dbid",0); // database id of a database configured in sql module } - void InsertEntry(unsigned long category,unsigned long nickid,unsigned long hostid,unsigned long sourceid,unsigned long date) + virtual void OnRehash(User* user) { - char querybuffer[MAXBUF]; - - snprintf(querybuffer,MAXBUF,"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); - SQLRequest* query = new SQLRequest(SQL_COUNT,dbid,querybuffer); - Request queryrequest((char*)query, this, SQLModule); - SQLResult* result = (SQLResult*)queryrequest.Send(); - - if (result->GetType() == SQL_ERROR) - { - Srv->Log(DEFAULT,"SQL log error: " + result->GetError()); - } - - if (result) - DELETE(result); - if (query) - DELETE(query); - - return; + ReadConfig(); } - long InsertHost(const std::string &host) + virtual const char* OnRequest(Request* request) { - long hid = -1; - - SQLRequest* query = new SQLRequest(SQL_RESULT,dbid,"SELECT id,hostname FROM ircd_log_hosts WHERE hostname='"+host+"'"); - Request queryrequest((char*)query, this, SQLModule); - SQLResult* result = (SQLResult*)queryrequest.Send(); - - if (result->GetType() == SQL_OK) - { - SQLRequest* rowrequest = new SQLRequest(SQL_ROW,dbid,""); - Request rowquery((char*)rowrequest, this, SQLModule); - SQLResult* rowresult = (SQLResult*)rowquery.Send(); - - if (rowresult->GetType() == SQL_ROW) - { - hid = atoi(rowresult->GetField("id").c_str()); - DELETE(rowresult); - } - - DELETE(rowrequest); - DELETE(result); - } - - query->SetQueryType(SQL_DONE); - query->SetConnID(dbid); - Request donerequest((char*)query, this, SQLModule); - donerequest.Send(); - DELETE(query); - - if (hid < 1) + if(strcmp(SQLRESID, request->GetId()) == 0) { - SQLRequest* query2 = new SQLRequest(SQL_COUNT,dbid,"INSERT INTO ircd_log_hosts VALUES('','"+host+"')"); - Request queryrequest2((char*)query2, this, SQLModule); - SQLResult* result2 = (SQLResult*)queryrequest2.Send(); - - if (result2->GetType() == SQL_ERROR) + SQLresult* res; + std::map::iterator n; + + res = static_cast(request); + n = active_queries.find(res->id); + + if (n != active_queries.end()) { - Srv->Log(DEFAULT,"SQL log error: " + result2->GetError()); + n->second->Go(res); + active_queries.erase(n); } - - if (result) - DELETE(result2); - if (query) - DELETE(query2); - hid = InsertHost(host); + + return SQLSUCCESS; } - - return hid; + + return NULL; } void AddLogEntry(int category, const std::string &nick, const std::string &host, const std::string &source) @@ -205,89 +250,60 @@ class ModuleSQLLog : public Module if (!SQLModule) return; - 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)); + SQLrequest req = SQLrequest(this, SQLModule, dbid, SQLquery("SELECT id,actor FROM ircd_log_actors WHERE actor='?'") % source); + if(req.Send()) + { + QueryInfo* i = new QueryInfo(ServerInstance, nick, source, host, req.id, category); + i->qs = FIND_SOURCE; + active_queries[req.id] = i; + } } - virtual void OnOper(userrec* user, const std::string &opertype) + virtual void OnOper(User* user, const std::string &opertype) { AddLogEntry(LT_OPER,user->nick,user->host,user->server); } - virtual void OnGlobalOper(userrec* user) + virtual void OnGlobalOper(User* user) { AddLogEntry(LT_OPER,user->nick,user->host,user->server); } - virtual int OnKill(userrec* source, userrec* dest, const std::string &reason) + virtual ModResult OnKill(User* source, User* dest, const std::string &reason) { AddLogEntry(LT_KILL,dest->nick,dest->host,source->nick); - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnPreCommand(const std::string &command, char **parameters, int pcnt, userrec *user, bool validated) + virtual ModResult OnPreCommand(std::string &command, std::vector ¶meters, User *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); + AddLogEntry(LT_XLINE,user->nick,command[0]+std::string(":")+parameters[0],user->server); } - return 0; - } - - virtual void OnUserConnect(userrec* user) - { - AddLogEntry(LT_CONNECT,user->nick,user->host,user->server); + return MOD_RES_PASSTHRU; } - virtual void OnGlobalConnect(userrec* user) + virtual void OnUserConnect(User* user) { AddLogEntry(LT_CONNECT,user->nick,user->host,user->server); } - virtual void OnUserQuit(userrec* user, const std::string &reason) + virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { AddLogEntry(LT_DISCONNECT,user->nick,user->host,user->server); } virtual void OnLoadModule(Module* mod, const std::string &name) { - AddLogEntry(LT_LOADMODULE,name,Srv->GetServerName(),Srv->GetServerName()); + AddLogEntry(LT_LOADMODULE,name,ServerInstance->Config->ServerName, ServerInstance->Config->ServerName); } - virtual ~ModuleSQLLog() - { - } - virtual Version GetVersion() { - return Version(1,0,0,1,VF_VENDOR); + return Version("Logs network-wide data to an SQL database", VF_VENDOR, API_VERSION); } - -}; -class ModuleSQLLogFactory : public ModuleFactory -{ - public: - ModuleSQLLogFactory() - { - } - - ~ModuleSQLLogFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleSQLLog(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSQLLogFactory; -} - +MODULE_INIT(ModuleSQLLog)