Few bug fixes in -d (there were late values in payloads in some cases; sqlalchemy returns RowProxy for tuple)

stamparm · stamparm · commit 1c47b3302035 · 2013-04-15T15:23:45.000+02:00
diff --git a/lib/core/agent.py b/lib/core/agent.py
@@ -42,6 +42,8 @@ class Agent(object):
     """
 
     def payloadDirect(self, query):
+        query = self.cleanupPayload(query)
+
         if query.startswith("AND "):
             query = query.replace("AND ", "SELECT ", 1)
         elif query.startswith(" UNION ALL "):
diff --git a/lib/utils/sqlalchemy.py b/lib/utils/sqlalchemy.py
@@ -45,7 +45,10 @@ def connect(self):
 
     def fetchall(self):
         try:
-            return self.cursor.fetchall()
+            retVal = []
+            for row in self.cursor.fetchall():
+                retVal.append(tuple(row))
+            return retVal
         except _sqlalchemy.exc.ProgrammingError, msg:
             logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg[1])
             return None
diff --git a/plugins/dbms/mysql/fingerprint.py b/plugins/dbms/mysql/fingerprint.py
@@ -224,7 +224,6 @@ def checkDbms(self):
                 else:
                     Backend.setVersionList([">= 5.0.0", "< 5.0.3"])
 
-            # For cases when information_schema is missing
             elif inject.checkBooleanExpression("DATABASE() LIKE SCHEMA()"):
                 Backend.setVersion(">= 5.0.2")
                 setDbms("%s 5" % DBMS.MYSQL)
