X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_pgsql.cpp;h=c0d301107e9488d177da328feb6ab0e4d3fb85a2;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=434f305395986625da8aff901ea4fe522114517f;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 434f30539..c0d301107 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -2,8 +2,8 @@ * | 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. @@ -15,10 +15,6 @@ #include #include #include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "configreader.h" #include "m_sqlv2.h" /* $ModDesc: PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API */ @@ -48,14 +44,25 @@ typedef std::map ConnMap; */ enum SQLstatus { CREAD, CWRITE, WREAD, WWRITE, RREAD, RWRITE }; +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; +} + /** SQLhost::GetDSN() - Overload to return correct DSN for PostgreSQL */ std::string SQLhost::GetDSN() { - std::ostringstream conninfo("connect_timeout = '2'"); + std::ostringstream conninfo("connect_timeout = '5'"); - if (ip.length()) - conninfo << " hostaddr = '" << ip << "'"; + if (host.length()) + conninfo << " host = '" << host << "'"; if (port) conninfo << " port = '" << port << "'"; @@ -83,10 +90,10 @@ std::string SQLhost::GetDSN() class ReconnectTimer : public Timer { - private: + private: Module* mod; - public: - ReconnectTimer(InspIRCd* SI, Module* m) + public: + ReconnectTimer(Module* m) : Timer(5, SI->Time(), false), mod(m) { } @@ -94,27 +101,6 @@ class ReconnectTimer : public Timer }; -/** Used to resolve sql server hostnames - */ -class SQLresolver : public Resolver -{ - private: - SQLhost host; - Module* mod; - public: - SQLresolver(Module* m, InspIRCd* Instance, const SQLhost& hi, bool &cached) - : Resolver(Instance, hi.host, DNS_QUERY_FORWARD, cached, (Module*)m), host(hi), mod(m) - { - } - - virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0); - - virtual void OnError(ResolverError e, const std::string &errormessage) - { - ServerInstance->Log(DEBUG, "PgSQL: DNS lookup failed (%s), dying horribly", errormessage.c_str()); - } -}; - /** PgSQLresult is a subclass of the mostly-pure-virtual class SQLresult. * All SQL providers must create their own subclass and define it's methods using that * database library's data retriveal functions. The aim is to avoid a slow and inefficient process @@ -132,8 +118,8 @@ class PgSQLresult : public SQLresult SQLfieldList* fieldlist; SQLfieldMap* fieldmap; public: - PgSQLresult(Module* self, Module* to, unsigned long id, PGresult* result) - : SQLresult(self, to, id), res(result), currentrow(0), fieldlist(NULL), fieldmap(NULL) + PgSQLresult(Module* self, Module* to, unsigned long rid, PGresult* result) + : SQLresult(self, to, rid), res(result), currentrow(0), fieldlist(NULL), fieldmap(NULL) { rows = PQntuples(res); cols = PQnfields(res); @@ -143,10 +129,10 @@ public: { /* If we allocated these, free them... */ if(fieldlist) - DELETE(fieldlist); + delete fieldlist; if(fieldmap) - DELETE(fieldmap); + delete fieldmap; PQclear(res); } @@ -219,9 +205,9 @@ public: if(currentrow < PQntuples(res)) { - int cols = PQnfields(res); + int ncols = PQnfields(res); - for(int i = 0; i < cols; i++) + for(int i = 0; i < ncols; i++) { fieldlist->push_back(GetValue(currentrow, i)); } @@ -248,9 +234,9 @@ public: if(currentrow < PQntuples(res)) { - int cols = PQnfields(res); + int ncols = PQnfields(res); - for(int i = 0; i < cols; i++) + for(int i = 0; i < ncols; i++) { fieldmap->insert(std::make_pair(ColName(i), GetValue(currentrow, i))); } @@ -267,9 +253,9 @@ public: if(currentrow < PQntuples(res)) { - int cols = PQnfields(res); + int ncols = PQnfields(res); - for(int i = 0; i < cols; i++) + for(int i = 0; i < ncols; i++) { fl->push_back(GetValue(currentrow, i)); } @@ -286,9 +272,9 @@ public: if(currentrow < PQntuples(res)) { - int cols = PQnfields(res); + int ncols = PQnfields(res); - for(int i = 0; i < cols; i++) + for(int i = 0; i < ncols; i++) { fm->insert(std::make_pair(ColName(i), GetValue(currentrow, i))); } @@ -301,12 +287,12 @@ public: virtual void Free(SQLfieldMap* fm) { - DELETE(fm); + delete fm; } virtual void Free(SQLfieldList* fl) { - DELETE(fl); + delete fl; } }; @@ -314,8 +300,7 @@ public: */ class SQLConn : public EventHandler { - private: - InspIRCd* Instance; + private: SQLhost confhost; /* The entry */ Module* us; /* Pointer to the SQL provider itself */ PGconn* sql; /* PgSQL database connection handle */ @@ -324,14 +309,14 @@ class SQLConn : public EventHandler QueryQueue queue; /* Queue of queries waiting to be executed on this connection */ time_t idle; /* Time we last heard from the database */ - public: - SQLConn(InspIRCd* SI, Module* self, const SQLhost& hi) - : EventHandler(), Instance(SI), confhost(hi), us(self), sql(NULL), status(CWRITE), qinprog(false) + public: + SQLConn(Module* self, const SQLhost& hi) + : EventHandler(), confhost(hi), us(self), sql(NULL), status(CWRITE), qinprog(false) { - idle = this->Instance->Time(); + idle = this->ServerInstance->Time(); if(!DoConnect()) { - Instance->Log(DEFAULT, "WARNING: Could not connect to database with id: " + ConvToStr(hi.id)); + ServerInstance->Logs->Log("m_pgsql",DEFAULT, "WARNING: Could not connect to database with id: " + ConvToStr(hi.id)); DelayReconnect(); } } @@ -381,9 +366,9 @@ class SQLConn : public EventHandler if(this->fd <= -1) return false; - if (!this->Instance->SE->AddFd(this)) + if (!this->ServerInstance->SE->AddFd(this)) { - Instance->Log(DEBUG, "BUG: Couldn't add pgsql socket to socket engine"); + ServerInstance->Logs->Log("m_pgsql",DEBUG, "BUG: Couldn't add pgsql socket to socket engine"); return false; } @@ -396,7 +381,7 @@ class SQLConn : public EventHandler switch(PQconnectPoll(sql)) { case PGRES_POLLING_WRITING: - Instance->SE->WantWrite(this); + ServerInstance->SE->WantWrite(this); status = CWRITE; return true; case PGRES_POLLING_READING: @@ -426,7 +411,7 @@ class SQLConn : public EventHandler /* We just read stuff from the server, that counts as it being alive * so update the idle-since time :p */ - idle = this->Instance->Time(); + idle = this->ServerInstance->Time(); if (PQisBusy(sql)) { @@ -468,9 +453,10 @@ class SQLConn : public EventHandler case PGRES_EMPTY_QUERY: case PGRES_BAD_RESPONSE: case PGRES_FATAL_ERROR: - reply.error.Id(QREPLY_FAIL); + reply.error.Id(SQL_QREPLY_FAIL); reply.error.Str(PQresultErrorMessage(result)); - default:; + default: + ; /* No action, other values are not errors */ } @@ -509,7 +495,7 @@ class SQLConn : public EventHandler switch(PQresetPoll(sql)) { case PGRES_POLLING_WRITING: - Instance->SE->WantWrite(this); + ServerInstance->SE->WantWrite(this); status = CWRITE; return DoPoll(); case PGRES_POLLING_READING: @@ -575,23 +561,32 @@ class SQLConn : public EventHandler char* query; /* Pointer to the current end of query, where we append new stuff */ char* queryend; + /* Total length of the unescaped parameters */ - unsigned int paramlen; + unsigned long maxparamlen, paramcount; - paramlen = 0; + /* The length of the longest parameter */ + maxparamlen = 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 PQsendQuery() */ - query = new char[req.query.q.length() + (paramlen*2) + 1]; + query = new char[req.query.q.length() + (maxparamlen*paramcount*2) + 1]; queryend = query; /* Okay, now we have a buffer large enough we need to start copying the query into it and escaping and substituting @@ -609,7 +604,53 @@ class SQLConn : public EventHandler * pointing at the right place. */ - if(req.query.p.size()) + /* 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) + { + int error = 0; + size_t len = 0; + +#ifdef PGSQL_HAS_ESCAPECONN + len = PQescapeStringConn(sql, queryend, paramscopy[paramnum].c_str(), paramscopy[paramnum].length(), &error); +#else + len = PQescapeString (queryend, paramscopy[paramnum].c_str(), paramscopy[paramnum].length()); +#endif + if (error) + { + ServerInstance->Logs->Log("m_pgsql", DEBUG, "BUG: Apparently PQescapeStringConn() failed somehow...don't know how or what to do..."); + } + + /* Incremenet queryend to the end of the newly escaped parameter */ + queryend += len; + } + else if (req.query.p.size()) { int error = 0; size_t len = 0; @@ -621,7 +662,7 @@ class SQLConn : public EventHandler #endif if(error) { - Instance->Log(DEBUG, "BUG: Apparently PQescapeStringConn() failed somehow...don't know how or what to do..."); + ServerInstance->Logs->Log("m_pgsql",DEBUG, "BUG: Apparently PQescapeStringConn() failed somehow...don't know how or what to do..."); } /* Incremenet queryend to the end of the newly escaped parameter */ @@ -632,7 +673,7 @@ class SQLConn : public EventHandler } else { - Instance->Log(DEBUG, "BUG: Found a substitution location but no parameter to substitute :|"); + ServerInstance->Logs->Log("m_pgsql",DEBUG, "BUG: Found a substitution location but no parameter to substitute :|"); break; } } @@ -656,11 +697,11 @@ class SQLConn : public EventHandler else { delete[] query; - return SQLerror(QSEND_FAIL, PQerrorMessage(sql)); + return SQLerror(SQL_QSEND_FAIL, PQerrorMessage(sql)); } } } - return SQLerror(BAD_CONN, "Can't query until connection is complete"); + return SQLerror(SQL_BAD_CONN, "Can't query until connection is complete"); } SQLerror Query(const SQLrequest &req) @@ -689,16 +730,17 @@ class SQLConn : public EventHandler return confhost; } - void Close() { - if (!this->Instance->SE->DelFd(this)) + void Close() + { + if (!this->ServerInstance->SE->DelFd(this)) { if (sql && PQstatus(sql) == CONNECTION_BAD) { - this->Instance->SE->DelFd(this, true); + this->ServerInstance->SE->DelFd(this, true); } else { - Instance->Log(DEBUG, "BUG: PQsocket cant be removed from socket engine!"); + ServerInstance->Logs->Log("m_pgsql",DEBUG, "BUG: PQsocket cant be removed from socket engine!"); } } @@ -713,15 +755,15 @@ class SQLConn : public EventHandler class ModulePgSQL : public Module { - private: + private: ConnMap connections; unsigned long currid; char* sqlsuccess; ReconnectTimer* retimer; - public: - ModulePgSQL(InspIRCd* Me) - : Module::Module(Me), currid(0) + public: + ModulePgSQL() + : currid(0) { ServerInstance->Modules->UseInterface("SQLutils"); @@ -737,8 +779,8 @@ class ModulePgSQL : public Module ReadConf(); ServerInstance->Modules->PublishInterface("SQL", this); - Implementation eventlist[] = { I_OnUnloadModule, I_OnRequest, I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnUserDisconnect }; - ServerInstance->Modules->Attach(eventlist, this, 6); + Implementation eventlist[] = { I_OnUnloadModule, I_OnRequest, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 3); } virtual ~ModulePgSQL() @@ -752,12 +794,8 @@ class ModulePgSQL : public Module ServerInstance->Modules->DoneWithInterface("SQLutils"); } - void Implements(char* List) - { - List[I_OnUnloadModule] = List[I_OnRequest] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1; - } - virtual void OnRehash(User* user, const std::string ¶meter) + virtual void OnRehash(User* user) { ReadConf(); } @@ -774,7 +812,7 @@ class ModulePgSQL : public Module bool HostInConf(const SQLhost &h) { - ConfigReader conf(ServerInstance); + ConfigReader conf; for(int i = 0; i < conf.Enumerate("database"); i++) { SQLhost host; @@ -795,11 +833,10 @@ class ModulePgSQL : public Module { ClearOldConnections(); - ConfigReader conf(ServerInstance); + ConfigReader conf; for(int i = 0; i < conf.Enumerate("database"); i++) { SQLhost host; - int ipvalid; host.id = conf.ReadValue("database", "id", i); host.host = conf.ReadValue("database", "hostname", i); @@ -812,46 +849,7 @@ class ModulePgSQL : public Module if (HasHost(host)) continue; -#ifdef IPV6 - if (strchr(host.host.c_str(),':')) - { - in6_addr blargle; - ipvalid = inet_pton(AF_INET6, host.host.c_str(), &blargle); - } - else -#endif - { - in_addr blargle; - ipvalid = inet_aton(host.host.c_str(), &blargle); - } - - if(ipvalid > 0) - { - /* The conversion succeeded, we were given an IP and we can give it straight to SQLConn */ - host.ip = host.host; - this->AddConn(host); - } - else if(ipvalid == 0) - { - /* Conversion failed, assume it's a host */ - SQLresolver* resolver; - - try - { - bool cached; - resolver = new SQLresolver(this, ServerInstance, host, cached); - ServerInstance->AddResolver(resolver, cached); - } - catch(...) - { - /* THE WORLD IS COMING TO AN END! */ - } - } - else - { - /* Invalid address family, die horribly. */ - ServerInstance->Log(DEBUG, "BUG: insp_aton failed returning -1, oh noes."); - } + this->AddConn(host); } } @@ -862,7 +860,7 @@ class ModulePgSQL : public Module { if (!HostInConf(iter->second->GetConfHost())) { - DELETE(iter->second); + delete iter->second; safei = iter; --iter; connections.erase(safei); @@ -876,7 +874,7 @@ class ModulePgSQL : public Module while ((i = connections.begin()) != connections.end()) { connections.erase(i); - DELETE(i->second); + delete i->second; } } @@ -884,14 +882,13 @@ class ModulePgSQL : public Module { if (HasHost(hi)) { - ServerInstance->Log(DEFAULT, "WARNING: A pgsql connection with id: %s already exists, possibly due to DNS delay. Aborting connection attempt.", hi.id.c_str()); + ServerInstance->Logs->Log("m_pgsql",DEFAULT, "WARNING: A pgsql connection with id: %s already exists. Aborting connection attempt.", hi.id.c_str()); return; } SQLConn* newconn; - /* The conversion succeeded, we were given an IP and we can give it straight to SQLConn */ - newconn = new SQLConn(ServerInstance, this, hi); + newconn = new SQLConn(this, hi); connections.insert(std::make_pair(hi.id, newconn)); } @@ -902,16 +899,16 @@ class ModulePgSQL : public Module { if (conn == iter->second) { - DELETE(iter->second); + delete iter->second; connections.erase(iter); break; } } - retimer = new ReconnectTimer(ServerInstance, this); + retimer = new ReconnectTimer(this); ServerInstance->Timers->AddTimer(retimer); } - virtual char* OnRequest(Request* request) + virtual const char* OnRequest(Request* request) { if(strcmp(SQLREQID, request->GetId()) == 0) { @@ -923,11 +920,11 @@ class ModulePgSQL : public Module req->id = NewID(); req->error = iter->second->Query(*req); - return (req->error.Id() == NO_ERROR) ? sqlsuccess : NULL; + return (req->error.Id() == SQL_NO_ERROR) ? sqlsuccess : NULL; } else { - req->error.Id(BAD_DBID); + req->error.Id(SQL_BAD_DBID); return NULL; } } @@ -958,23 +955,10 @@ class ModulePgSQL : public Module virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION); + return Version("PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION); } }; -/* move this here to use AddConn, rather that than having the whole - * module above SQLConn, since this is buggin me right now :/ - */ -void SQLresolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum) -{ - if (!resultnum) - { - host.ip = result; - ((ModulePgSQL*)mod)->AddConn(host); - ((ModulePgSQL*)mod)->ClearOldConnections(); - } -} - void ReconnectTimer::Tick(time_t time) { ((ModulePgSQL*)mod)->ReadConf();