X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mssql.cpp;h=8cd9e2ea7a955f103de3376b113a7ea51fa56d52;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=ece93ef8ae2ab340d5d81a8f9431d49600f77e7c;hpb=546c9922c0d1d9141f19bd7da62624acdc231c59;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp index ece93ef8a..8cd9e2ea7 100644 --- a/src/modules/extra/m_mssql.cpp +++ b/src/modules/extra/m_mssql.cpp @@ -1,12 +1,12 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 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. * * --------------------------------------------------- */ @@ -21,68 +21,48 @@ #include "m_sqlv2.h" /* $ModDesc: MsSQL provider */ +/* $CompileFlags: exec("grep VERSION_NO /usr/include/tdsver.h 2>/dev/null | perl -e 'print "-D_TDSVER=".((<> =~ /freetds v(\d+\.\d+)/i) ? $1*100 : 0);'") */ /* $LinkerFlags: -ltds */ /* $ModDep: m_sqlv2.h */ class SQLConn; class MsSQLResult; -class ResultNotifier; +class ModuleMsSQL; typedef std::map ConnMap; -typedef std::deque paramlist; typedef std::deque ResultQueue; -ResultNotifier* resultnotify = NULL; - - -class ResultNotifier : public BufferedSocket +unsigned long count(const char * const str, char a) { - Module* mod; - insp_sockaddr sock_us; - socklen_t uslen; - - 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 - { - uslen = sizeof(sock_us); - if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen)) - { - throw ModuleException("Could not create random listening port on localhost"); - } - } - - ResultNotifier(InspIRCd* SI, Module* m, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), mod(m) + unsigned long n = 0; + for (const char *p = str; *p; ++p) { + if (*p == '?') + ++n; } + return n; +} - /* 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 - } +ConnMap connections; +Mutex* ResultsMutex; +Mutex* LoggingMutex; - virtual int OnIncomingConnection(int newsock, char* ip) - { - Dispatch(); - return false; +class QueryThread : public SocketThread +{ + private: + ModuleMsSQL* Parent; + public: + QueryThread(ModuleMsSQL* mod) + : SocketThread(si), Parent(mod), { } - - void Dispatch(); + ~QueryThread() { } + virtual void Run(); + virtual void OnNotify(); }; - class MsSQLResult : public SQLresult { - private: + private: int currentrow; int rows; int cols; @@ -94,7 +74,7 @@ class MsSQLResult : public SQLresult SQLfieldList* fieldlist; SQLfieldMap* fieldmap; - public: + public: MsSQLResult(Module* self, Module* to, unsigned int rid) : SQLresult(self, to, rid), currentrow(0), rows(0), cols(0), fieldlist(NULL), fieldmap(NULL) { @@ -244,45 +224,50 @@ class MsSQLResult : public SQLresult { delete fl; } - - }; class SQLConn : public classbase { - private: + private: ResultQueue results; - InspIRCd* Instance; Module* mod; SQLhost host; TDSLOGIN* login; TDSSOCKET* sock; - TDSCONNECTION* conn; + TDSCONTEXT* context; - public: - SQLConn(InspIRCd* SI, Module* m, const SQLhost& hi) - : Instance(SI), mod(m), host(hi) + public: + QueryQueue queue; + + SQLConn(Module* m, const SQLhost& hi) + : mod(m), host(hi), login(NULL), sock(NULL), context(NULL) { - if (OpenDB() == TDS_SUCCEED) + if (OpenDB()) { std::string query("USE " + host.name); if (tds_submit_query(sock, query.c_str()) == TDS_SUCCEED) { if (tds_process_simple_query(sock) != TDS_SUCCEED) { - Instance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id); + LoggingMutex->Lock(); + ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id); + LoggingMutex->Unlock(); CloseDB(); } } else { - Instance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id); + LoggingMutex->Lock(); + ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id); + LoggingMutex->Unlock(); CloseDB(); } } else { - Instance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not connect to DB with id: " + host.id); + LoggingMutex->Lock(); + ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not connect to DB with id: " + host.id); + LoggingMutex->Unlock(); CloseDB(); } } @@ -294,6 +279,9 @@ class SQLConn : public classbase SQLerror Query(SQLrequest &req) { + if (!sock) + return SQLerror(SQL_BAD_CONN, "Socket was NULL, check if SQL server is running."); + /* Pointer to the buffer we screw around with substitution in */ char* query; @@ -301,30 +289,98 @@ 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 */ - 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 mssql 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) + { + /* Custom escaping for this one. converting ' to '' should make SQL Server happy. Ugly but fast :] + */ + char* escaped = new char[(paramscopy[paramnum].length() * 2) + 1]; + char* escend = escaped; + for (std::string::iterator p = paramscopy[paramnum].begin(); p < paramscopy[paramnum].end(); p++) + { + if (*p == '\'') + { + *escend = *p; + escend++; + *escend = *p; + } + *escend = *p; + escend++; + } + *escend = 0; + + for (char* n = escaped; *n; n++) + { + *queryend = *n; + queryend++; + } + delete[] escaped; + } + else if (req.query.p.size()) { /* Custom escaping for this one. converting ' to '' should make SQL Server happy. Ugly but fast :] */ @@ -342,7 +398,7 @@ class SQLConn : public classbase escend++; } *escend = 0; - + for (char* n = escaped; *n; n++) { *queryend = *n; @@ -359,32 +415,34 @@ class SQLConn : public classbase *queryend = req.query.q[i]; queryend++; } - querylength++; } *queryend = 0; req.query.q = query; - MsSQLResult* res = new MsSQLResult(mod, req.GetSource(), req.id); + MsSQLResult* res = new MsSQLResult((Module*)mod, req.GetSource(), req.id); res->dbid = host.id; res->query = req.query.q; - const char* msquery = strdup(req.query.q.data()); - Instance->Logs->Log("m_mssql",DEBUG,"doing Query: %s",msquery); + char* msquery = strdup(req.query.q.data()); + LoggingMutex->Lock(); + ServerInstance->Logs->Log("m_mssql",DEBUG,"doing Query: %s",msquery); + LoggingMutex->Unlock(); if (tds_submit_query(sock, msquery) != TDS_SUCCEED) { std::string error("failed to execute: "+std::string(req.query.q.data())); delete[] query; delete res; - return SQLerror(QSEND_FAIL, error); + free(msquery); + return SQLerror(SQL_QSEND_FAIL, error); } delete[] query; free(msquery); - + int tds_res; while (tds_process_tokens(sock, &tds_res, NULL, TDS_TOKEN_RESULTS) == TDS_SUCCEED) { - //Instance->Logs->Log("m_mssql",DEBUG,"<******> result type: %d", tds_res); - //Instance->Logs->Log("m_mssql",DEBUG,"AFFECTED ROWS: %d", sock->rows_affected); + //ServerInstance->Logs->Log("m_mssql",DEBUG,"<******> result type: %d", tds_res); + //ServerInstance->Logs->Log("m_mssql",DEBUG,"AFFECTED ROWS: %d", sock->rows_affected); switch (tds_res) { case TDS_ROWFMT_RESULT: @@ -422,7 +480,11 @@ class SQLConn : public classbase unsigned char* src; CONV_RESULT dres; ctype = tds_get_conversion_type(col->column_type, col->column_size); - src = &(sock->current_results->current_row[col->column_offset]); +#if _TDSVER >= 82 + src = col->column_data; +#else + src = &(sock->current_results->current_row[col->column_offset]); +#endif srclen = col->column_cur_size; tds_convert(sock->tds_ctx, ctype, (TDS_CHAR *) src, srclen, SYBCHAR, &dres); data[j] = (char*)dres.ib; @@ -434,26 +496,29 @@ class SQLConn : public classbase default: break; - } + } } + ResultsMutex->Lock(); results.push_back(res); - SendNotify(); + ResultsMutex->Unlock(); return SQLerror(); } static int HandleMessage(const TDSCONTEXT * pContext, TDSSOCKET * pTdsSocket, TDSMESSAGE * pMessage) { - /* TODO: FIXME */ - //Instance->Logs->Log("m_mssql",DEBUG,pMessage->message); - //printf("Message: %s\n", pMessage->message); + SQLConn* sc = (SQLConn*)pContext->parent; + LoggingMutex->Lock(); + sc->ServerInstance->Logs->Log("m_mssql", DEBUG, "Message for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message); + LoggingMutex->Unlock(); return 0; } static int HandleError(const TDSCONTEXT * pContext, TDSSOCKET * pTdsSocket, TDSMESSAGE * pMessage) { - /* TODO: FIXME */ - //Instance->Logs->Log("m_mssql",DEBUG,pMessage->message); - //printf("Error: %s\n", pMessage->message); + SQLConn* sc = (SQLConn*)pContext->parent; + LoggingMutex->Lock(); + sc->ServerInstance->Logs->Log("m_mssql", DEFAULT, "Error for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message); + LoggingMutex->Unlock(); return 0; } @@ -467,16 +532,14 @@ class SQLConn : public classbase res->UpdateAffectedCount(); } - int OpenDB() + bool OpenDB() { CloseDB(); - TDSCONTEXT* cont; - cont = tds_alloc_context(NULL); - cont->msg_handler = HandleMessage; - cont->err_handler = HandleError; + TDSCONNECTION* conn = NULL; login = tds_alloc_login(); + tds_set_app(login, "TSQL"); tds_set_library(login,"TDS-Library"); tds_set_host(login, ""); tds_set_server(login, host.host.c_str()); @@ -486,19 +549,41 @@ class SQLConn : public classbase tds_set_port(login, host.port); tds_set_packet(login, 512); - sock = tds_alloc_socket(cont, 512); - conn = tds_read_config_info(NULL, login, cont->locale); - return tds_connect(sock, conn); + context = tds_alloc_context(this); + context->msg_handler = HandleMessage; + context->err_handler = HandleError; + + sock = tds_alloc_socket(context, 512); + tds_set_parent(sock, NULL); + + conn = tds_read_config_info(NULL, login, context->locale); + + if (tds_connect(sock, conn) == TDS_SUCCEED) + { + tds_free_connection(conn); + return 1; + } + tds_free_connection(conn); + return 0; } void CloseDB() { - if (login) - tds_free_login(login); if (sock) + { tds_free_socket(sock); - if (conn) - tds_free_connection(conn); + sock = NULL; + } + if (context) + { + tds_free_context(context); + context = NULL; + } + if (login) + { + tds_free_login(login); + login = NULL; + } } SQLhost GetConfHost() @@ -511,6 +596,7 @@ class SQLConn : public classbase while (results.size()) { MsSQLResult* res = results[0]; + ResultsMutex->Lock(); if (res->GetDest()) { res->Send(); @@ -524,6 +610,7 @@ class SQLConn : public classbase delete res; } results.pop_front(); + ResultsMutex->Unlock(); } } @@ -537,34 +624,10 @@ class SQLConn : public classbase } } - void SendNotify() + void DoLeadingQuery() { - int QueueFD; - if ((QueueFD = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1) - { - /* crap, we're out of sockets... */ - return; - } - - insp_sockaddr addr; - -#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 - - if (connect(QueueFD, (sockaddr*)&addr,sizeof(addr)) == -1) - { - /* wtf, we cant connect to it, but we just created it! */ - return; - } + SQLrequest& req = queue.front(); + req.error = Query(req); } }; @@ -572,14 +635,17 @@ class SQLConn : public classbase class ModuleMsSQL : public Module { - private: - ConnMap connections; + private: unsigned long currid; + QueryThread* queryDispatcher; - public: - ModuleMsSQL(InspIRCd* Me) - : Module::Module(Me), currid(0) + public: + ModuleMsSQL() + : currid(0) { + LoggingMutex = new Mutex(); + ResultsMutex = new Mutex(); + ServerInstance->Modules->UseInterface("SQLutils"); if (!ServerInstance->Modules->PublishFeature("SQL", this)) @@ -587,10 +653,11 @@ class ModuleMsSQL : public Module throw ModuleException("m_mssql: Unable to publish feature 'SQL'"); } - resultnotify = new ResultNotifier(ServerInstance, this); - ReadConf(); + queryDispatcher = new QueryThread(this); + ServerInstance->Threads->Start(queryDispatcher); + ServerInstance->Modules->PublishInterface("SQL", this); Implementation eventlist[] = { I_OnRequest, I_OnRehash }; ServerInstance->Modules->Attach(eventlist, this, 2); @@ -598,18 +665,18 @@ class ModuleMsSQL : public Module virtual ~ModuleMsSQL() { + queryDispatcher->join(); + delete queryDispatcher; ClearQueue(); ClearAllConnections(); - resultnotify->SetFd(-1); - resultnotify->state = I_ERROR; - resultnotify->OnError(I_ERR_SOCKET); - resultnotify->ClosePending = true; - delete resultnotify; + ServerInstance->Modules->UnpublishInterface("SQL", this); ServerInstance->Modules->UnpublishFeature("SQL"); ServerInstance->Modules->DoneWithInterface("SQLutils"); - } + delete LoggingMutex; + delete ResultsMutex; + } void SendQueue() { @@ -639,7 +706,7 @@ class ModuleMsSQL : public Module bool HostInConf(const SQLhost &h) { - ConfigReader conf(ServerInstance); + ConfigReader conf; for(int i = 0; i < conf.Enumerate("database"); i++) { SQLhost host; @@ -649,18 +716,17 @@ class ModuleMsSQL : 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; } return false; } - + void ReadConf() { ClearOldConnections(); - ConfigReader conf(ServerInstance); + ConfigReader conf; for(int i = 0; i < conf.Enumerate("database"); i++) { SQLhost host; @@ -671,7 +737,6 @@ class ModuleMsSQL : 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; @@ -684,13 +749,15 @@ class ModuleMsSQL : public Module { if (HasHost(hi)) { + LoggingMutex->Lock(); ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: A MsSQL connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str()); + LoggingMutex->Unlock(); return; } SQLConn* newconn; - newconn = new SQLConn(ServerInstance, this, hi); + newconn = new SQLConn(this, hi); connections.insert(std::make_pair(hi.id, newconn)); } @@ -720,9 +787,11 @@ class ModuleMsSQL : public Module } } - virtual void OnRehash(User* user, const std::string ¶meter) + virtual void OnRehash(User* user) { + queryDispatcher->LockQueue(); ReadConf(); + queryDispatcher->UnlockQueueWakeup(); } virtual const char* OnRequest(Request* request) @@ -730,18 +799,27 @@ class ModuleMsSQL : public Module if(strcmp(SQLREQID, request->GetId()) == 0) { SQLrequest* req = (SQLrequest*)request; + + queryDispatcher->LockQueue(); + ConnMap::iterator iter; + + const char* returnval = NULL; + if((iter = connections.find(req->dbid)) != connections.end()) { req->id = NewID(); - req->error = iter->second->Query(*req); - return SQLSUCCESS; + iter->second->queue.push(*req); + returnval= SQLSUCCESS; } else { - req->error.Id(BAD_DBID); - return NULL; + req->error.Id(SQL_BAD_DBID); } + + queryDispatcher->UnlockQueueWakeup(); + + return returnval; } return NULL; } @@ -756,14 +834,44 @@ class ModuleMsSQL : public Module virtual Version GetVersion() { - return Version(1,0,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION); + return Version("MsSQL provider", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); } }; -void ResultNotifier::Dispatch() +void QueryThread::OnNotify() +{ + Parent->SendQueue(); +} + +void QueryThread::Run() { - ((ModuleMsSQL*)mod)->SendQueue(); + this->LockQueue(); + while (this->GetExitFlag() == false) + { + SQLConn* conn = NULL; + for (ConnMap::iterator i = connections.begin(); i != connections.end(); i++) + { + if (i->second->queue.totalsize()) + { + conn = i->second; + break; + } + } + if (conn) + { + this->UnlockQueue(); + conn->DoLeadingQuery(); + this->NotifyParent(); + this->LockQueue(); + conn->queue.pop(); + } + else + { + this->WaitForQueue(); + } + } + this->UnlockQueue(); } MODULE_INIT(ModuleMsSQL)