Patch for an Issue #582

stamparm · stamparm · commit 02de2aee6d10 · 2013-12-26T22:27:04.000+01:00
diff --git a/lib/core/agent.py b/lib/core/agent.py
@@ -351,7 +351,8 @@ def nullAndCastField(self, field):
                 else:
                     nulledCastedField = rootQuery.isnull.query % nulledCastedField
 
-            if conf.hexConvert or conf.binaryFields and field in conf.binaryFields.split(','):
+            kb.binaryField = conf.binaryFields and field in conf.binaryFields.split(',')
+            if conf.hexConvert or kb.binaryField:
                 nulledCastedField = self.hexConvertField(nulledCastedField)
 
         return nulledCastedField
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -3478,18 +3478,19 @@ def _(value):
         if value and isinstance(value, basestring) and len(value) % 2 == 0:
             retVal = hexdecode(retVal)
 
-            if Backend.isDbms(DBMS.MSSQL) and value.startswith("0x"):
-                try:
-                    retVal = retVal.decode("utf-16-le")
-                except UnicodeDecodeError:
-                    pass
-            elif Backend.isDbms(DBMS.HSQLDB):
-                try:
-                    retVal = retVal.decode("utf-16-be")
-                except UnicodeDecodeError:
-                    pass
-            if not isinstance(retVal, unicode):
-                retVal = getUnicode(retVal, "utf8")
+            if not kb.binaryField:
+                if Backend.isDbms(DBMS.MSSQL) and value.startswith("0x"):
+                    try:
+                        retVal = retVal.decode("utf-16-le")
+                    except UnicodeDecodeError:
+                        pass
+                elif Backend.isDbms(DBMS.HSQLDB):
+                    try:
+                        retVal = retVal.decode("utf-16-be")
+                    except UnicodeDecodeError:
+                        pass
+                if not isinstance(retVal, unicode):
+                    retVal = getUnicode(retVal, "utf8")
 
         return retVal
 
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -1572,6 +1572,7 @@ def _setKnowledgeBaseAttributes(flushAll=True):
     kb.arch = None
     kb.authHeader = None
     kb.bannerFp = AttribDict()
+    kb.binaryField = False
 
     kb.brute = AttribDict({"tables": [], "columns": []})
     kb.bruteMode = False
