minor update regarding good samaritan

stamparm · stamparm · commit 8ed76b3024b9 · 2010-05-25T14:51:02.000Z
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -1262,11 +1262,11 @@ def getGoodSamaritanParameters(part, prevValue, originalCharset):
                 predictedCharset.append(ordChar)
 
         predictedCharset.sort()
-        
-        if len(predictedCharset) > 1:
-            singleValue = None
 
-        return singleValue, predictedCharset, otherCharset
+        if len(predictedCharset) > 1:
+            return None, predictedCharset, otherCharset
+        else:
+            return singleValue, None, originalCharset
     else:
         return None, None, originalCharset
 
diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
@@ -371,13 +371,18 @@ def downloadThread():
 
             if conf.useCommonPrediction:
                 singleValue, predictedCharset, otherCharset = getGoodSamaritanParameters(kb.partRun, finalValue, asciiTbl)
+                val = None
+
                 if singleValue is None:
                     val = getChar(index, predictedCharset, False) if predictedCharset else None
                 else:
-                    ##check if that's the value
-                    #finalValue = singleValue
-                    #break
+                    #forgedPayload = safeStringFormat('AND (%s) = \'%s\'', (expressionUnescaped, singleValue))
+                    #result = Request.queryPage(urlencode(forgedPayload))
+                    #if result:
+                    #    finalValue = singleValue
+                    #    break
                     pass
+
                 if not val:
                     val = getChar(index, otherCharset)
             else:
