X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqlite3.cpp;h=680053bf1e08ff1a31c6a617634fc814a37de6be;hb=7e843c22e16c81054bad18073d24fe1a07026431;hp=77b269e04457a79e83d709164ee65b8043f08f81;hpb=2ab88037d8d7d6df3fb9686216a0b36f5ece2313;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index 77b269e04..680053bf1 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -1,88 +1,105 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 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. + * the file COPYING for details. * * --------------------------------------------------- */ #include "inspircd.h" #include -#include "users.h" -#include "channels.h" -#include "modules.h" - #include "m_sqlv2.h" /* $ModDesc: sqlite3 provider */ -/* $CompileFlags: -Wno-variadic-macros pkgconfversion("sqlite3","3.3") pkgconfincludes("sqlite3","/sqlite3.h","") */ +/* $CompileFlags: pkgconfversion("sqlite3","3.3") pkgconfincludes("sqlite3","/sqlite3.h","") */ /* $LinkerFlags: pkgconflibs("sqlite3","/libsqlite3.so","-lsqlite3") */ /* $ModDep: m_sqlv2.h */ +/* $NoPedantic */ class SQLConn; class SQLite3Result; class ResultNotifier; +class SQLiteListener; +class ModuleSQLite3; typedef std::map ConnMap; typedef std::deque paramlist; typedef std::deque ResultQueue; -ResultNotifier* resultnotify = NULL; +unsigned long count(const char * const str, char a) +{ + unsigned long n = 0; + for (const char *p = str; *p; ++p) + { + if (*p == '?') + ++n; + } + return n; +} +ResultNotifier* notifier = NULL; +SQLiteListener* listener = NULL; +int QueueFD = -1; class ResultNotifier : public BufferedSocket { - Module* mod; - insp_sockaddr sock_us; + ModuleSQLite3* mod; + + public: + ResultNotifier(ModuleSQLite3* m, int newfd) : BufferedSocket(newfd), mod(m) + { + } + + void OnDataReady() + { + recvq.clear(); + Dispatch(); + } + + void OnError(BufferedSocketError) {} + + void Dispatch(); +}; + +class SQLiteListener : public ListenSocketBase +{ + ModuleSQLite3* Parent; + irc::sockets::sockaddrs sock_us; socklen_t uslen; + FileReader* index; public: - /* Create a socket on a random port. Let the tcp stack allocate us an available port */ -#ifdef IPV6 - ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "::1", 0, true, 3000), mod(m) -#else - ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "127.0.0.1", 0, true, 3000), mod(m) -#endif + SQLiteListener(ModuleSQLite3* P, int port, const std::string &addr) : ListenSocketBase(port, addr), Parent(P) { uslen = sizeof(sock_us); if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen)) { - throw ModuleException("Could not create random listening port on localhost"); + throw ModuleException("Could not getsockname() to find out port number for ITC port"); } } - ResultNotifier(InspIRCd* SI, Module* m, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), mod(m) + void OnAcceptReady(int nfd) { + new ResultNotifier(Parent, nfd); } - /* Using getsockname and ntohs, we can determine which port number we were allocated */ int GetPort() { -#ifdef IPV6 - return ntohs(sock_us.sin6_port); -#else - return ntohs(sock_us.sin_port); -#endif + int port = 0; + std::string addr; + irc::sockets::satoap(&sock_us, addr, port); + return port; } - - virtual int OnIncomingConnection(int newsock, char* ip) - { - Dispatch(); - return false; - } - - void Dispatch(); }; - class SQLite3Result : public SQLresult { - private: + private: int currentrow; int rows; int cols; @@ -94,9 +111,9 @@ class SQLite3Result : public SQLresult SQLfieldList* fieldlist; SQLfieldMap* fieldmap; - public: - SQLite3Result(Module* self, Module* to, unsigned int id) - : SQLresult(self, to, id), currentrow(0), rows(0), cols(0), fieldlist(NULL), fieldmap(NULL) + public: + SQLite3Result(Module* self, Module* to, unsigned int rid) + : SQLresult(self, to, rid), currentrow(0), rows(0), cols(0), fieldlist(NULL), fieldmap(NULL) { } @@ -104,7 +121,7 @@ class SQLite3Result : public SQLresult { } - void AddRow(int colsnum, char **data, char **colname) + void AddRow(int colsnum, char **dat, char **colname) { colnames.clear(); cols = colsnum; @@ -112,7 +129,7 @@ class SQLite3Result : public SQLresult { fieldlists.resize(fieldlists.size()+1); colnames.push_back(colname[i]); - SQLfield sf(data[i] ? data[i] : "", data[i] ? false : true); + SQLfield sf(dat[i] ? dat[i] : "", dat[i] ? false : true); fieldlists[rows].push_back(sf); } rows++; @@ -250,20 +267,19 @@ class SQLite3Result : public SQLresult class SQLConn : public classbase { - private: + private: ResultQueue results; - InspIRCd* Instance; Module* mod; SQLhost host; sqlite3* conn; - public: - SQLConn(InspIRCd* SI, Module* m, const SQLhost& hi) - : Instance(SI), mod(m), host(hi) + public: + SQLConn(Module* m, const SQLhost& hi) + : mod(m), host(hi) { if (OpenDB() != SQLITE_OK) { - Instance->Log(DEFAULT, "WARNING: Could not open DB with id: " + host.id); + ServerInstance->Logs->Log("m_sqlite3",DEFAULT, "WARNING: Could not open DB with id: " + host.id); CloseDB(); } } @@ -282,30 +298,84 @@ class SQLConn : public classbase char* queryend; /* Total length of the unescaped parameters */ - unsigned long paramlen; + unsigned long maxparamlen, paramcount; - /* Total length of query, used for binary-safety in mysql_real_query */ - unsigned long querylength = 0; + /* The length of the longest parameter */ + maxparamlen = 0; - paramlen = 0; for(ParamL::iterator i = req.query.p.begin(); i != req.query.p.end(); i++) { - paramlen += i->size(); + if (i->size() > maxparamlen) + maxparamlen = i->size(); } + /* How many params are there in the query? */ + paramcount = count(req.query.q.c_str(), '?'); + + /* This stores copy of params to be inserted with using numbered params 1;3B*/ + ParamL paramscopy(req.query.p); + /* To avoid a lot of allocations, allocate enough memory for the biggest the escaped query could possibly be. - * sizeofquery + (totalparamlength*2) + 1 + * sizeofquery + (maxtotalparamlength*2) + 1 * - * The +1 is for null-terminating the string for mysql_real_escape_string + * The +1 is for null-terminating the string */ - query = new char[req.query.q.length() + (paramlen*2) + 1]; + + query = new char[req.query.q.length() + (maxparamlen*paramcount*2) + 1]; queryend = query; for(unsigned long i = 0; i < req.query.q.length(); i++) { if(req.query.q[i] == '?') { - if(req.query.p.size()) + /* We found a place to substitute..what fun. + * use sqlite calls to escape and write the + * escaped string onto the end of our query buffer, + * then we "just" need to make sure queryend is + * pointing at the right place. + */ + + /* Is it numbered parameter? + */ + + bool numbered; + numbered = false; + + /* Numbered parameter number :| + */ + unsigned int paramnum; + paramnum = 0; + + /* Let's check if it's a numbered param. And also calculate it's number. + */ + + while ((i < req.query.q.length() - 1) && (req.query.q[i+1] >= '0') && (req.query.q[i+1] <= '9')) + { + numbered = true; + ++i; + paramnum = paramnum * 10 + req.query.q[i] - '0'; + } + + if (paramnum > paramscopy.size() - 1) + { + /* index is out of range! + */ + numbered = false; + } + + + if (numbered) + { + char* escaped; + escaped = sqlite3_mprintf("%q", paramscopy[paramnum].c_str()); + for (char* n = escaped; *n; n++) + { + *queryend = *n; + queryend++; + } + sqlite3_free(escaped); + } + else if (req.query.p.size()) { char* escaped; escaped = sqlite3_mprintf("%q", req.query.p.front().c_str()); @@ -325,12 +395,11 @@ class SQLConn : public classbase *queryend = req.query.q[i]; queryend++; } - querylength++; } *queryend = 0; req.query.q = query; - SQLite3Result* res = new SQLite3Result(mod, req.GetSource(), req.id); + SQLite3Result* res = new SQLite3Result(mod, req.source, req.id); res->dbid = host.id; res->query = req.query.q; paramlist params; @@ -345,7 +414,7 @@ class SQLConn : public classbase sqlite3_free(errmsg); delete[] query; delete res; - return SQLerror(QSEND_FAIL, error); + return SQLerror(SQL_QSEND_FAIL, error); } delete[] query; @@ -379,7 +448,7 @@ class SQLConn : public classbase int OpenDB() { - return sqlite3_open(host.host.c_str(), &conn); + return sqlite3_open_v2(host.host.c_str(), &conn, SQLITE_OPEN_READWRITE, 0); } void CloseDB() @@ -398,7 +467,7 @@ class SQLConn : public classbase while (results.size()) { SQLite3Result* res = results[0]; - if (res->GetDest()) + if (res->dest) { res->Send(); } @@ -426,32 +495,25 @@ class SQLConn : public classbase void SendNotify() { - int QueueFD; - if ((QueueFD = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1) + if (QueueFD < 0) { - /* crap, we're out of sockets... */ - return; - } - - insp_sockaddr addr; + if ((QueueFD = socket(AF_INET, SOCK_STREAM, 0)) == -1) + { + /* crap, we're out of sockets... */ + return; + } -#ifdef IPV6 - insp_aton("::1", &addr.sin6_addr); - addr.sin6_family = AF_FAMILY; - addr.sin6_port = htons(resultnotify->GetPort()); -#else - insp_inaddr ia; - insp_aton("127.0.0.1", &ia); - addr.sin_family = AF_FAMILY; - addr.sin_addr = ia; - addr.sin_port = htons(resultnotify->GetPort()); -#endif + irc::sockets::sockaddrs addr; + irc::sockets::aptosa("127.0.0.1", listener->GetPort(), &addr); - if (connect(QueueFD, (sockaddr*)&addr,sizeof(addr)) == -1) - { - /* wtf, we cant connect to it, but we just created it! */ - return; + if (connect(QueueFD, &addr.sa, sa_size(addr)) == -1) + { + /* wtf, we cant connect to it, but we just created it! */ + return; + } } + char id = 0; + send(QueueFD, &id, 1, 0); } }; @@ -459,13 +521,13 @@ class SQLConn : public classbase class ModuleSQLite3 : public Module { - private: + private: ConnMap connections; unsigned long currid; - public: - ModuleSQLite3(InspIRCd* Me) - : Module::Module(Me), currid(0) + public: + ModuleSQLite3() + : currid(0) { ServerInstance->Modules->UseInterface("SQLutils"); @@ -474,31 +536,52 @@ class ModuleSQLite3 : public Module throw ModuleException("m_sqlite3: Unable to publish feature 'SQL'"); } - resultnotify = new ResultNotifier(ServerInstance, this); + /* Create a socket on a random port. Let the tcp stack allocate us an available port */ + listener = new SQLiteListener(this, 0, "127.0.0.1"); + + if (listener->GetFd() == -1) + { + ServerInstance->Modules->DoneWithInterface("SQLutils"); + throw ModuleException("m_sqlite3: unable to create ITC pipe"); + } + else + { + ServerInstance->Logs->Log("m_sqlite3", DEBUG, "SQLite: Interthread comms port is %d", listener->GetPort()); + } ReadConf(); ServerInstance->Modules->PublishInterface("SQL", this); + Implementation eventlist[] = { I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 1); } virtual ~ModuleSQLite3() { ClearQueue(); ClearAllConnections(); - resultnotify->SetFd(-1); - resultnotify->state = I_ERROR; - resultnotify->OnError(I_ERR_SOCKET); - resultnotify->ClosePending = true; - delete resultnotify; + + ServerInstance->SE->DelFd(listener); + + if (QueueFD >= 0) + { + shutdown(QueueFD, 2); + close(QueueFD); + } + + if (notifier) + { + ServerInstance->SE->DelFd(notifier); + notifier->Close(); + } + + ServerInstance->GlobalCulls.Apply(); + ServerInstance->Modules->UnpublishInterface("SQL", this); ServerInstance->Modules->UnpublishFeature("SQL"); ServerInstance->Modules->DoneWithInterface("SQLutils"); } - void Implements(char* List) - { - List[I_OnRequest] = List[I_OnRehash] = 1; - } void SendQueue() { @@ -528,7 +611,7 @@ class ModuleSQLite3 : public Module bool HostInConf(const SQLhost &h) { - ConfigReader conf(ServerInstance); + ConfigReader conf; for(int i = 0; i < conf.Enumerate("database"); i++) { SQLhost host; @@ -538,7 +621,6 @@ class ModuleSQLite3 : public Module host.name = conf.ReadValue("database", "name", i); host.user = conf.ReadValue("database", "username", i); host.pass = conf.ReadValue("database", "password", i); - host.ssl = conf.ReadFlag("database", "ssl", "0", i); if (h == host) return true; } @@ -549,7 +631,7 @@ class ModuleSQLite3 : public Module { ClearOldConnections(); - ConfigReader conf(ServerInstance); + ConfigReader conf; for(int i = 0; i < conf.Enumerate("database"); i++) { SQLhost host; @@ -560,7 +642,6 @@ class ModuleSQLite3 : public Module host.name = conf.ReadValue("database", "name", i); host.user = conf.ReadValue("database", "username", i); host.pass = conf.ReadValue("database", "password", i); - host.ssl = conf.ReadFlag("database", "ssl", "0", i); if (HasHost(host)) continue; @@ -573,13 +654,13 @@ class ModuleSQLite3 : public Module { if (HasHost(hi)) { - ServerInstance->Log(DEFAULT, "WARNING: A sqlite connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str()); + ServerInstance->Logs->Log("m_sqlite3",DEFAULT, "WARNING: A sqlite connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str()); return; } SQLConn* newconn; - newconn = new SQLConn(ServerInstance, this, hi); + newconn = new SQLConn(this, hi); connections.insert(std::make_pair(hi.id, newconn)); } @@ -591,7 +672,7 @@ class ModuleSQLite3 : public Module { if (!HostInConf(iter->second->GetConfHost())) { - DELETE(iter->second); + delete iter->second; safei = iter; --iter; connections.erase(safei); @@ -605,34 +686,31 @@ class ModuleSQLite3 : public Module while ((i = connections.begin()) != connections.end()) { connections.erase(i); - DELETE(i->second); + delete i->second; } } - virtual void OnRehash(User* user, const std::string ¶meter) + virtual void OnRehash(User* user) { ReadConf(); } - virtual char* OnRequest(Request* request) + void OnRequest(Request& request) { - if(strcmp(SQLREQID, request->GetId()) == 0) + if(strcmp(SQLREQID, request.id) == 0) { - SQLrequest* req = (SQLrequest*)request; + SQLrequest* req = (SQLrequest*)&request; ConnMap::iterator iter; if((iter = connections.find(req->dbid)) != connections.end()) { req->id = NewID(); req->error = iter->second->Query(*req); - return SQLSUCCESS; } else { - req->error.Id(BAD_DBID); - return NULL; + req->error.Id(SQL_BAD_DBID); } } - return NULL; } unsigned long NewID() @@ -645,15 +723,14 @@ class ModuleSQLite3 : public Module virtual Version GetVersion() { - return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION); + return Version("sqlite3 provider", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); } }; void ResultNotifier::Dispatch() { - ((ModuleSQLite3*)mod)->SendQueue(); + mod->SendQueue(); } MODULE_INIT(ModuleSQLite3) -