Patch for annoying retrieval of columns during dump (if -C used)

stamparm · stamparm · commit 058f63a0506f · 2015-09-22T12:33:11.000+02:00
diff --git a/plugins/generic/databases.py b/plugins/generic/databases.py
@@ -370,7 +370,7 @@ def getTables(self, bruteForce=None):
 
         return kb.data.cachedTables
 
-    def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None):
+    def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None, dumpMode=False):
         self.forceDbmsEnum()
 
         if conf.db is None or conf.db == CURRENT_DB:
@@ -517,10 +517,6 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None):
                     condQueryStr = "%%s%s" % colCondParam
                     condQuery = " AND (%s)" % " OR ".join(condQueryStr % (condition, unsafeSQLIdentificatorNaming(col)) for col in sorted(colList))
 
-                infoMsg += "for table '%s' " % unsafeSQLIdentificatorNaming(tbl)
-                infoMsg += "in database '%s'" % unsafeSQLIdentificatorNaming(conf.db)
-                logger.info(infoMsg)
-
                 if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.PGSQL, DBMS.HSQLDB):
                     query = rootQuery.inband.query % (unsafeSQLIdentificatorNaming(tbl), unsafeSQLIdentificatorNaming(conf.db))
                     query += condQuery
@@ -534,7 +530,14 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None):
                 elif Backend.getIdentifiedDbms() in (DBMS.SQLITE, DBMS.FIREBIRD):
                     query = rootQuery.inband.query % tbl
 
-                values = inject.getValue(query, blind=False, time=False)
+                if dumpMode and colList:
+                    values = [(_,) for _ in colList]
+                else:
+                    infoMsg += "for table '%s' " % unsafeSQLIdentificatorNaming(tbl)
+                    infoMsg += "in database '%s'" % unsafeSQLIdentificatorNaming(conf.db)
+                    logger.info(infoMsg)
+
+                    values = inject.getValue(query, blind=False, time=False)
 
                 if Backend.isDbms(DBMS.MSSQL) and isNoneValue(values):
                     index, values = 1, []
@@ -612,10 +615,6 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None):
                     condQueryStr = "%%s%s" % colCondParam
                     condQuery = " AND (%s)" % " OR ".join(condQueryStr % (condition, unsafeSQLIdentificatorNaming(col)) for col in sorted(colList))
 
-                infoMsg += "for table '%s' " % unsafeSQLIdentificatorNaming(tbl)
-                infoMsg += "in database '%s'" % unsafeSQLIdentificatorNaming(conf.db)
-                logger.info(infoMsg)
-
                 if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.PGSQL, DBMS.HSQLDB):
                     query = rootQuery.blind.count % (unsafeSQLIdentificatorNaming(tbl), unsafeSQLIdentificatorNaming(conf.db))
                     query += condQuery
@@ -639,22 +638,31 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None):
                     parseSqliteTableSchema(value)
                     return kb.data.cachedColumns
 
-                count = inject.getValue(query, union=False, error=False, expected=EXPECTED.INT, charsetType=CHARSET_TYPE.DIGITS)
-
                 table = {}
                 columns = {}
 
-                if not isNumPosStrValue(count):
-                    if Backend.isDbms(DBMS.MSSQL):
-                        count, index, values = 0, 1, []
-                        while True:
-                            query = rootQuery.blind.query3 % (conf.db, tbl, index)
-                            value = unArrayizeValue(inject.getValue(query, union=False, error=False))
-                            if isNoneValue(value) or value == " ":
-                                break
-                            else:
-                                columns[safeSQLIdentificatorNaming(value)] = None
-                                index += 1
+                if dumpMode and colList:
+                    count = 0
+                    for value in colList:
+                        columns[safeSQLIdentificatorNaming(value)] = None
+                else:
+                    infoMsg += "for table '%s' " % unsafeSQLIdentificatorNaming(tbl)
+                    infoMsg += "in database '%s'" % unsafeSQLIdentificatorNaming(conf.db)
+                    logger.info(infoMsg)
+
+                    count = inject.getValue(query, union=False, error=False, expected=EXPECTED.INT, charsetType=CHARSET_TYPE.DIGITS)
+
+                    if not isNumPosStrValue(count):
+                        if Backend.isDbms(DBMS.MSSQL):
+                            count, index, values = 0, 1, []
+                            while True:
+                                query = rootQuery.blind.query3 % (conf.db, tbl, index)
+                                value = unArrayizeValue(inject.getValue(query, union=False, error=False))
+                                if isNoneValue(value) or value == " ":
+                                    break
+                                else:
+                                    columns[safeSQLIdentificatorNaming(value)] = None
+                                    index += 1
 
                     if not columns:
                         errMsg = "unable to retrieve the %scolumns " % ("number of " if not Backend.isDbms(DBMS.MSSQL) else "")
diff --git a/plugins/generic/entries.py b/plugins/generic/entries.py
@@ -103,7 +103,7 @@ def dumpTable(self, foundData=None):
 
             if foundData is None:
                 kb.data.cachedColumns = {}
-                self.getColumns(onlyColNames=True)
+                self.getColumns(onlyColNames=True, dumpMode=True)
             else:
                 kb.data.cachedColumns = foundData
 
