Changeset 514 for library

Timestamp:

04/11/06 10:56:33 (3 years ago)

Author:

common

Message:

library
- SQLHander::escapeString(string *str)
- SQLManager::escapeString(string *str)
- TCP/UDSSocket proper dropping on CL_DROP
- Socket::doWrite(string &s)
- service-gotek2 login, checking presence, reporting magnets, adding instance *may* work

Files:

• library/trunk/library-core/include/SQLHandler.hpp (modified) (1 diff)
• library/trunk/library-core/include/SQLManager.hpp (modified) (2 diffs)
• library/trunk/library-core/include/Socket.hpp (modified) (1 diff)
• library/trunk/library-core/src/SQLManager.cpp (modified) (1 diff)
• library/trunk/library-core/src/Socket.cpp (modified) (1 diff)
• library/trunk/library-core/src/TCPSocket.cpp (modified) (1 diff)
• library/trunk/library-core/src/UDSSocket.cpp (modified) (1 diff)
• library/trunk/modules/service-gotek2/GotekPacket.cpp (modified) (2 diffs)
• library/trunk/modules/service-gotek2/SQLContext.hpp (modified) (2 diffs)
• library/trunk/modules/service-gotek2/service-gotek2.cpp (modified) (18 diffs)
• library/trunk/modules/service-gotek2/service-gotek2.hpp (modified) (1 diff)
• library/trunk/modules/sqlhandler-postgres/sqlhandler-postgres.cpp (modified) (1 diff)
• library/trunk/modules/sqlhandler-postgres/sqlhandler-postgres.hpp (modified) (1 diff)

library/trunk/library-core/include/SQLHandler.hpp

@@ -46 +46 @@
-
-                virtual bool runQuery(SQLQuery *query)=0;
-
+
+
-                virtual string escapeBinary(string *str)=0;
-                virtual string unescapeBinary(string *str)=0;
-
+
-
-                virtual string getSQLHandlerName()

library/trunk/library-core/include/SQLManager.hpp

@@ -38 +38 @@
-#define SQL_ESCAPE_BINARY(x)    g_Library->getSQLMgr()->escapeBinary((x))
-#define SQL_UNESCAPE_BINARY(x)  g_Library->getSQLMgr()->unescapeBinary((x))
+#define SQL_ESCAPE_STRING(x)    g_Library->getSQLMgr()->escapeString((x))
-
-using namespace std;
@@ -54 +55 @@
-
-                virtual SQLQuery *addQuery(string *query, SQLCallback *callback, void *obj);
+                virtual string escapeString(string *str);
-                virtual string escapeBinary(string *str);
-                virtual string unescapeBinary(string *str);

library/trunk/library-core/include/Socket.hpp

@@ -112 +112 @@
-
-        virtual int32_t doWrite(char *msg,uint32_t len)=0;
+                virtual int32_t doWrite(string &s);
-
-        virtual bool checkTimeout()=0;

library/trunk/library-core/src/SQLManager.cpp

@@ -97 +97 @@
-}
-
+string SQLManager::escapeString(string *str)
+{
+        return m_SQLHandler->escapeString(str);
+}
+
-string SQLManager::escapeBinary(string *str)
-{

library/trunk/library-core/src/Socket.cpp

@@ -492 +492 @@
-        return sDesc;
-}
+
+int32_t Socket::doWrite(string &s)
+{
+        return doWrite((char *)s.data(),s.size());
+}

library/trunk/library-core/src/TCPSocket.cpp

@@ -596 +596 @@
-        m_LastAction = time(NULL);
-
-(length == 0 || ( length == -1 && errno != EAGAIN )) &&
+
-        {
-                logDebug("Connection %s CLOSED \n",getDescription().c_str());

library/trunk/library-core/src/UDSSocket.cpp

@@ -456 +456 @@
-        m_LastAction = time(NULL);
-
-(length == 0 || ( length == -1 && errno != EAGAIN )) &&
+
-        {
-                logDebug("Connection %s CLOSED \n",getDescription().c_str());

library/trunk/modules/service-gotek2/GotekPacket.cpp

@@ -17 +17 @@
-        m_data = data;
-        m_options = options;
-
+
-        m_type = (GotekPacketType)readUInt8();
-
@@ -27 +27 @@
-                throw GotekException(string("Packet size information does not match actual packet size!"));
-        }
+*/      
-}
-

library/trunk/modules/service-gotek2/SQLContext.hpp

@@ -39 +39 @@
-                        m_Time = starttime;
-                        m_Command = command;
+                        m_String = "";
+                }
+
+                SQLContext(uint8_t command, time_t starttime, string *str)
+                {
+                        m_Time = starttime;
+                        m_Command = command;
+                        m_String = *str;
-                }
-
@@ -50 +58 @@
-                        return m_Time;
-                }
+                string          getString()
+                {
+                        return m_String;
+                }
-
-        private:
-                time_t          m_Time;
-                uint8_t         m_Command;
+                string          m_String;
-        };
-}

library/trunk/modules/service-gotek2/service-gotek2.cpp

@@ -193 +193 @@
-        m_SessionKey = (((unsigned long long) time(0)) << 48) | (((unsigned long long) (rand() & 0xFF)) << 32);
-        m_SessionKey |= (unsigned long long) rand();
-//     gp->writeRaw(string(m_SessionKey,8)
+       gp->writeRaw((void *)&m_SessionKey,8
-
-// server version
@@ -201 +201 @@
-        gp->writeString(string("no description yet"));
-
-
-
+
+
+
-
-}
@@ -259 +260 @@
-                }
-        }
+        logSpam("return %i\n",cl);
-        return cl;
-}
@@ -275 +277 @@
-        GotekPacket *gp = GotekPacket::createReadPacket(m_Buffer);
-
-
-
-
+
+
+
+
+
+
+
+
+
-        {
-                *needmoredata = true;
@@ -283 +291 @@
-        }
-
+    
-// parse the data
-        string hash;
-unsigned char command;
+
-        try
-        {
@@ -293 +302 @@
-                hash = gp->readRaw(64);
-                command = gp->readUInt8();
-
-        }
-        catch ( GotekException e )
@@ -314 +322 @@
-// create the query context so we know which query returns, so we can answer appropriate
-
-
+,&hash
-
-// query 
@@ -324 +332 @@
-         m_QueryQueue.push_back(sqlquery);
-
-
-
+
-         return CL_ASSIGN;
-}
@@ -360 +367 @@
-
-        uint8_t command = gp->readUInt8();
-
-
+
+
+
-        {
-                *needmoredata = true;
+                delete gp;
-                 return CL_ASSIGN;
-        }
@@ -397 +406 @@
-        }
-
+        m_Buffer.erase(0,gotekpacketsize + 5);
-
-        return cl;
@@ -403 +413 @@
-ConsumeLevel ServiceGotek2Dialogue::processCTRL_CHECK_PRESENCE(GotekPacket *gp)
-{
+        logPF();
+        uint8_t hash_type = gp->readUInt8();
+        if (hash_type != HTYPE_MD5 && hash_type != HTYPE_SHA512)
+        {
+                m_Socket->doWrite(mapEnum(RPL_UNSUPPORTED),1);
+                return CL_ASSIGN;
+        }
+
+        
+// create the query context so we know which query returns, so we can answer appropriate
+
+        SQLContext *sqlctx = new SQLContext(CCMD_CHECK_PRESENCE,time(NULL));
+
+        string hash;
+        switch(hash_type)
+        {
+        case HTYPE_SHA512:
+                {
+                        string hash = gp->readRaw(64);
+                        hash = SQL_ESCAPE_BINARY(&hash);
+                        string query = "SELECT \"sha512_hash\" FROM \"users-dp\".\"malware\" WHERE sha512_hash = '" + hash +"';";
+                        SQLQuery *sqlquery = g_Library->getSQLMgr()->addQuery(&query,this,(void *)sqlctx);
+                        m_QueryQueue.push_back(sqlquery);
+                }
+                break;
+
+        case HTYPE_MD5:
+                {
+                        string hash = gp->readRaw(16);
+                        hash = SQL_ESCAPE_BINARY(&hash);
+                        string query = "SELECT \"sha512_hash\" FROM \"users-dp\".\"malware\" WHERE sha512_hash = '" + hash +"';";
+                        SQLQuery *sqlquery = g_Library->getSQLMgr()->addQuery(&query,this,(void *)sqlctx);
+                        m_QueryQueue.push_back(sqlquery);
+                }
+                break;
+
+        }
+
+        return CL_ASSIGN;
+}
+
+ConsumeLevel ServiceGotek2Dialogue::processCTRL_STORE_MAGNET(GotekPacket *gp)
+{
+        logPF();
+        string hash = gp->readRaw(64);
+        uint8_t writemode = gp->readUInt8();
+        string name = gp->readString();
+        uint16_t valuesize = gp->readUInt16();
+        string value = gp->readRaw(valuesize);
+
+        name = SQL_ESCAPE_STRING(&name);
+        hash = SQL_ESCAPE_BINARY(&hash);
+        value = SQL_ESCAPE_STRING(&value);
+
+        writemode = 0;
+
+        SQLContext *sqlctx = new SQLContext(CCMD_STORE_MAGNET,time(NULL));
+
+        string query = "INSERT INTO \"users-dp\".\"magnets\" (\"sha512_hash\",\"name\",\"value\") VALUES ('" + hash + "','" + name + "','" + value + "')";
+
+        SQLQuery *sqlquery = g_Library->getSQLMgr()->addQuery(&query,this,(void *)sqlctx);
+        m_QueryQueue.push_back(sqlquery);
+
+
+        return CL_ASSIGN;
+}
+
+ConsumeLevel ServiceGotek2Dialogue::processCTRL_REQUEST_NOTIFICATION(GotekPacket *gp)
+{
-        logPF(); 
-        return CL_DROP;
-}
-
-STORE_MAGNET
+REQUEST_SILENCE
-{
-        logPF(); 
@@ -413 +492 @@
-}
-
-QUEST_NOTIFICATION
+PORT_INSTANCE
-{
-        logPF(); 
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -516 +628 @@
-        if ( m_QueryQueue.size() == 0 )
-        {
-\n",sqlresult->getQuery().c_str
+ context %x\n",sqlresult->getQuery().c_str(), sqlresult->getObject
-                m_Socket->setStatus(SS_CLOSED);
-                return false;
@@ -538 +650 @@
-        }
-
+        m_QueryQueue.pop_front();
-        return ret;
-}
@@ -558 +671 @@
-                g_Library->getUtilities()->sha512((unsigned char *)bkey.c_str(),bkey.size(),hash);
-                
-m_Buffer.data
+sqlctx->getString().c_str
-                {
-logInfo("Login success: %s\n",m_Username.c_str());
-if (sqlctx->getCommand() == CTYPE_CTRL
+
+switch ( sqlctx->getCommand()
-                        {
+                        case CTYPE_CTRL:
+                                logInfo("Login success (ctrl) :%s\n",m_Username.c_str());
-                                m_ClientType = GCT_CONTROL;
-}else
-if (sqlctx->getCommand() == CTYPE_DATA )
-{
+       break;
+case CTYPE_DATA:
+       logInfo("Login success (data) :%s\n",m_Username.c_str());
-                                m_ClientType = GCT_DATA;
+                                break;
+                        default:
+                                logCrit("Login error, invalid connection type requested %0x\n",sqlctx->getCommand());
-                        }
-
-                        m_Socket->doWrite(mapEnum(RPL_AUTHORIZED),1);
-
@@ -597 +714 @@
-{
-        logPF();
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-bool ServiceGotek2Dialogue::sqlSuccessDATA(SQLResult *sqlresult)
@@ -641 +811 @@
-        }
-
+        m_QueryQueue.pop_front();
-        return ret;
-}
@@ -658 +829 @@
-        logPF();
-
+        bool retval=false;
+
+        SQLContext *sqlctx = (SQLContext *)sqlresult->getObject();
+        switch ( sqlctx->getCommand() )
+        {
+        case CCMD_STORE_MAGNET:
+                retval = sqlFailureCTRL_STORE_MAGNET(sqlresult);
+                break;
+
+        case CCMD_REPORT_INSTANCE:
+                retval = sqlFailureCTRL_REPORT_INSTANCE(sqlresult);
+                break;
+        }
+
+        delete sqlctx;
+
+        return retval;
+}
+
+bool ServiceGotek2Dialogue::sqlFailureCTRL_STORE_MAGNET(SQLResult *sqlresult)
+{
+        logPF();
+        m_Socket->doWrite(mapEnum(RPL_NACK),1);
+        return true;
+}
+
+bool ServiceGotek2Dialogue::sqlFailureCTRL_REPORT_INSTANCE(SQLResult *sqlresult)
+{
+        logPF();
+        m_Socket->doWrite(mapEnum(RPL_NACK),1);
-        return true;
-}

library/trunk/modules/service-gotek2/service-gotek2.hpp

@@ -152 +152 @@
-                bool sqlSuccess(SQLResult *result);
-                bool sqlSuccessLOGIN(SQLResult *result);
+
-                bool sqlSuccessCTRL(SQLResult *result);
+                bool sqlSuccessCTRL_CHECK_PRESENCE(SQLResult *result);
+                bool sqlSuccessCTRL_STORE_MAGNET(SQLResult *result);
+                bool sqlSuccessCTRL_REPORT_INSTANCE(SQLResult *result);
+
-                bool sqlSuccessDATA(SQLResult *result);
-
-                bool sqlFailure(SQLResult *result);
-                bool sqlFailureLOGIN(SQLResult *result);
+
-                bool sqlFailureCTRL(SQLResult *result);
+                bool sqlFailureCTRL_STORE_MAGNET(SQLResult *result);
+                bool sqlFailureCTRL_REPORT_INSTANCE(SQLResult *result);
+
+
-                bool sqlFailureDATA(SQLResult *result);
-

library/trunk/modules/sqlhandler-postgres/sqlhandler-postgres.cpp

@@ -154 +154 @@
-        }
-        return true;
+}
+
+string SQLHandlerPostgres::escapeString(string *str)
+{
+        int size = str->size() * 2 + 1 ;
+        char *escaped = (char *)malloc(size);
+        size = PQescapeString(escaped,str->c_str(),str->size());
+        string result(escaped,size);
+        free(escaped);
+        return result;
-}
-

library/trunk/modules/sqlhandler-postgres/sqlhandler-postgres.hpp

@@ -57 +57 @@
-                ~SQLHandlerPostgres();
-                bool runQuery(SQLQuery *query);
+                string escapeString(string *str);
-                string escapeBinary(string *str);
-                string unescapeBinary(string *str);