Minor represenation fix

stamparm · stamparm · commit 014e4e005579 · 2013-02-15T14:48:24.000+01:00
diff --git a/lib/core/dump.py b/lib/core/dump.py
@@ -212,7 +212,7 @@ def dbTables(self, dbTables):
                     if table and isListLike(table):
                         table = table[0]
 
-                    maxlength = max(maxlength, len(normalizeUnicode(table) or str(table)))
+                    maxlength = max(maxlength, len(unsafeSQLIdentificatorNaming(normalizeUnicode(table) or str(table))))
 
             lines = "-" * (int(maxlength) + 2)
 
@@ -232,6 +232,7 @@ def dbTables(self, dbTables):
                     if table and isListLike(table):
                         table = table[0]
 
+                    table = unsafeSQLIdentificatorNaming(table)
                     blank = " " * (maxlength - len(normalizeUnicode(table) or str(table)))
                     self._write("| %s%s |" % (table, blank))
 
@@ -263,6 +264,7 @@ def dbTableColumns(self, tableColumns, content_type=None):
                     for column in colList:
                         colType = columns[column]
 
+                        column = unsafeSQLIdentificatorNaming(column)
                         maxlength1 = max(maxlength1, len(column or ""))
                         maxlength2 = max(maxlength2, len(colType or ""))
 
@@ -299,6 +301,8 @@ def dbTableColumns(self, tableColumns, content_type=None):
 
                     for column in colList:
                         colType = columns[column]
+
+                        column = unsafeSQLIdentificatorNaming(column)
                         blank1 = " " * (maxlength1 - len(column))
 
                         if colType is not None:
diff --git a/lib/techniques/brute/use.py b/lib/techniques/brute/use.py
@@ -18,6 +18,7 @@
 from lib.core.common import randomStr
 from lib.core.common import safeStringFormat
 from lib.core.common import safeSQLIdentificatorNaming
+from lib.core.common import unsafeSQLIdentificatorNaming
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
@@ -101,7 +102,7 @@ def tableExistsThread():
 
                 if conf.verbose in (1, 2) and not hasattr(conf, "api"):
                     clearConsoleLine(True)
-                    infoMsg = "[%s] [INFO] retrieved: %s\r\n" % (time.strftime("%X"), table)
+                    infoMsg = "[%s] [INFO] retrieved: %s\r\n" % (time.strftime("%X"), unsafeSQLIdentificatorNaming(table))
                     dataToStdout(infoMsg, True)
 
             if conf.verbose in (1, 2):
@@ -197,7 +198,7 @@ def columnExistsThread():
 
                 if conf.verbose in (1, 2) and not hasattr(conf, "api"):
                     clearConsoleLine(True)
-                    infoMsg = "[%s] [INFO] retrieved: %s\r\n" % (time.strftime("%X"), column)
+                    infoMsg = "[%s] [INFO] retrieved: %s\r\n" % (time.strftime("%X"), unsafeSQLIdentificatorNaming(column))
                     dataToStdout(infoMsg, True)
 
             if conf.verbose in (1, 2):
