]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/extra/m_sqllog.cpp
Describe module purpose in /MODULES output
[user/henk/code/inspircd.git] / src / modules / extra / m_sqllog.cpp
index b2ddf1c5d40e69a06b13b26113942bd1eb75fefb..556cc8b31c33f04bd2ee806571b67213de21b392 100644 (file)
@@ -2,50 +2,25 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev.
- *                    E-mail:
- *             <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * 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.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <string>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <poll.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
 #include "inspircd.h"
 #include "m_sqlv2.h"
 
-
 static Module* SQLModule;
 static Module* MyMod;
 static std::string dbid;
-extern time_t TIME;
-
-extern InspIRCd* ServerInstance;
 
 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;
 
@@ -53,214 +28,150 @@ std::map<unsigned long,QueryInfo*> active_queries;
 
 class QueryInfo
 {
- public:
+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;
-       std::string lastquery;
+       bool insert;
 
-       QueryInfo(const std::string &n, const std::string &h, unsigned long i, int cat)
+       QueryInfo(InspIRCd* Instance, const std::string &n, const std::string &s, const std::string &h, unsigned long i, int cat)
        {
+               ServerInstance = Instance;
                qs = FIND_SOURCE;
                nick = n;
+               source = s;
                hostname = h;
                id = i;
                category = cat;
                sourceid = nickid = hostid = -1;
-               date = TIME;
-               lastquery = "";
+               date = ServerInstance->Time();
+               insert = false;
        }
 
        void Go(SQLresult* res)
        {
-               // Nothing here and not sent yet
-               SQLrequest req = SQLreq(MyMod, SQLModule, dbid, "", "");
-
-               log(DEBUG,"State: %d",qs);
-
+               SQLrequest req = SQLrequest(MyMod, SQLModule, dbid, SQLquery(""));
                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->Cols())
+                               if (res->Rows() && sourceid == -1 && !insert)
                                {
-                                       if (sourceid == -1)
+                                       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())
                                        {
-                                               sourceid = atoi(res->GetValue(0,0).d.c_str());
+                                               insert = false;
                                                qs = FIND_NICK;
+                                               active_queries[req.id] = this;
                                        }
-                                       else qs = INSERT_SOURCE;
                                }
-                               else
+                               else if (res->Rows() && sourceid == -1 && insert)
                                {
-                                       if (lastquery == "SELECT id,actor FROM ircd_log_actors WHERE actor='?'")
-                                       {
-                                               qs = INSERT_SOURCE;
-                                       }
-                                       else
+                                       req = SQLrequest(MyMod, SQLModule, dbid, SQLquery("SELECT id,actor FROM ircd_log_actors WHERE actor='?'") % source);
+                                       if(req.Send())
                                        {
-                                               lastquery = "SELECT id,actor FROM ircd_log_actors WHERE actor='?'";
-                                               req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", nick);
-                                               if(req.Send())
-                                               {
-                                                       qs = FIND_SOURCE;
-                                                       active_queries[req.id] = this;
-                                               }
-                                               else
-                                               {
-                                                       log(DEBUG, "SQLrequest failed: %s", req.error.Str());
-                                               }
-                                               break;
+                                               insert = false;
+                                               qs = FIND_SOURCE;
+                                               active_queries[req.id] = this;
                                        }
                                }
-                       case INSERT_SOURCE:
-                               // "INSERT INTO ircd_log_actors VALUES('','"+nick+"')")
-                               // after we've done this, go back to FIND_SOURCE
-                               lastquery = "INSERT INTO ircd_log_actors VALUES('','?')";
-                               req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log_actors VALUES('','?')", nick);
-                               if(req.Send())
-                               {
-                                       qs = FIND_NICK;
-                                       active_queries[req.id] = this;
-                               }
                                else
                                {
-                                       log(DEBUG, "SQLrequest failed: %s", req.error.Str());
+                                       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:
-                               // "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->Cols())
+                               if (res->Rows() && nickid == -1 && !insert)
                                {
-                                        if (nickid == -1)
-                                        {
-                                                nickid = atoi(res->GetValue(0,0).d.c_str());
-                                                qs = FIND_HOST;
-                                        }
-                                        else qs = INSERT_NICK;
-                               }
-                               else
-                               {
-                                       if (lastquery == "SELECT id,actor FROM ircd_log_actors WHERE actor='?'")
-                                       {
-                                               qs = INSERT_NICK;
-                                       }
-                                       else
+                                       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())
                                        {
-                                               req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", nick);
-                                               if(req.Send())
-                                               {
-                                                       qs = FIND_NICK;
-                                                       active_queries[req.id] = this;
-                                               }
-                                               else
-                                               {
-                                                       log(DEBUG, "SQLrequest failed: %s", req.error.Str());
-                                               }
-                                               break;
+                                               insert = false;
+                                               qs = FIND_HOST;
+                                               active_queries[req.id] = this;
                                        }
                                }
-                       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())
+                               else if (res->Rows() && nickid == -1 && insert)
                                {
-                                       qs = FIND_HOST;
-                                       active_queries[req.id] = this;
+                                       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
                                {
-                                       log(DEBUG, "SQLrequest failed: %s", req.error.Str());
+                                       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:
-                               // "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->Cols())
-                               {
-                                        if (hostid == -1)
-                                        {
-                                                hostid = atoi(res->GetValue(0,0).d.c_str());
-                                                qs = INSERT_LOGENTRY;
-                                        }
-                                        else qs = INSERT_HOST;
-                               }
-                               else
+                               if (res->Rows() && hostid == -1 && !insert)
                                {
-                                       if (lastquery == "SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'")
-                                       {
-                                               qs = INSERT_HOST;
-                                       }
-                                       else
+                                       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())
                                        {
-                                               lastquery = "SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'";
-                                               req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'",hostname);
-                                               if(req.Send())
-                                               {
-                                                       qs = FIND_HOST;
-                                                       active_queries[req.id] = this;
-                                               }
-                                               else
-                                               {
-                                                       log(DEBUG, "SQLrequest failed: %s", req.error.Str());
-                                               }
-                                               break;
+                                               insert = true;
+                                               qs = DONE;
+                                               active_queries[req.id] = this;
                                        }
                                }
-                       case INSERT_HOST:
-                               // "INSERT INTO ircd_log_hosts VALUES('','"+host+"')"
-                               // after we've done this, go back to FIND_HOST
-                               lastquery = "INSERT INTO ircd_log_hosts VALUES('','?')";
-                               req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log_hosts VALUES('','?')", hostname);
-                               if(req.Send())
+                               else if (res->Rows() && hostid == -1 && insert)
                                {
-                                       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);
+                                       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
                                {
-                                       lastquery = "INSERT INTO ircd_log VALUES()";
-                                       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 = SQLrequest(MyMod, SQLModule, dbid, SQLquery("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:
-                               active_queries[req.id] = NULL;
+                               std::map<unsigned long,QueryInfo*>::iterator x = active_queries.find(req.id);
+                               if (x != active_queries.end())
+                               {
+                                       delete x->second;
+                                       active_queries.erase(x);
+                               }
                        break;
                }
        }
@@ -270,64 +181,67 @@ class QueryInfo
 
 class ModuleSQLLog : public Module
 {
-       Server* Srv;
-       ConfigReader* Conf;
 
  public:
-       bool ReadConfig()
+       ModuleSQLLog(InspIRCd* Me)
+       : Module(Me)
        {
-               Conf = new ConfigReader();
-               dbid = Conf->ReadValue("sqllog","dbid",0);      // database id of a database configured in sql module
-               DELETE(Conf);
-               SQLModule = ServerInstance->FindFeature("SQL");
-               if (!SQLModule)
-                       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);
-       }
+               ServerInstance->Modules->UseInterface("SQLutils");
+               ServerInstance->Modules->UseInterface("SQL");
 
-       ModuleSQLLog(Server* Me) : Module::Module(Me)
-       {
-               Srv = Me;
-               ReadConfig();
+               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);
        }
 
-       void Implements(char* List)
+       virtual ~ModuleSQLLog()
        {
-               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] = List[I_OnRequest] = 1;
+               ServerInstance->Modules->DoneWithInterface("SQL");
+               ServerInstance->Modules->DoneWithInterface("SQLutils");
        }
 
-       virtual void OnRehash(const std::string &parameter)
+
+       void ReadConfig()
+       {
+               ConfigReader Conf(ServerInstance);
+               dbid = Conf.ReadValue("sqllog","dbid",0);       // database id of a database configured in sql module
+       }
+
+       virtual void OnRehash(User* user)
        {
                ReadConfig();
        }
 
-       virtual char* OnRequest(Request* request)
+       virtual const char* OnRequest(Request* request)
        {
-               log(DEBUG,"OnRequest in m_sqllog.so");
                if(strcmp(SQLRESID, request->GetId()) == 0)
                {
                        SQLresult* res;
                        std::map<unsigned long, QueryInfo*>::iterator n;
 
                        res = static_cast<SQLresult*>(request);
-                       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");
                                n->second->Go(res);
-
-                               std::map<unsigned long, QueryInfo*>::iterator n = active_queries.find(res->id);
                                active_queries.erase(n);
                        }
+
+                       return SQLSUCCESS;
                }
-               return SQLSUCCESS;
+
+               return NULL;
        }
 
        void AddLogEntry(int category, const std::string &nick, const std::string &host, const std::string &source)
@@ -336,101 +250,60 @@ 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 = SQLrequest(this, SQLModule, dbid, SQLquery("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(ServerInstance, nick, source, host, req.id, category);
                        i->qs = FIND_SOURCE;
                        active_queries[req.id] = i;
-                       log(DEBUG,"Active query id %d",req.id);
-               }
-               else
-               {
-                       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)
+       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, const char** parameters, int pcnt, userrec *user, bool validated)
+       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, 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;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnUserConnect(userrec* user)
+       virtual void OnUserConnect(User* user)
        {
                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)
+       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,ServerInstance->Config->ServerName,ServerInstance->Config->ServerName);
+               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)