Patch for an Issue #403

stamparm · stamparm · commit e9b86350f101 · 2013-03-05T18:32:31.000+01:00
diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
@@ -484,13 +484,10 @@ def blindThread():
                         # One-shot query containing equals commonValue
                         testValue = unescaper.escape("'%s'" % commonValue) if "'" not in commonValue else unescaper.escape("%s" % commonValue, quote=False)
 
-                        if timeBasedCompare:
-                            query = kb.injection.data[kb.technique].vector
-                            query = agent.prefixQuery(query.replace("[INFERENCE]", "(%s)=%s" % (expressionUnescaped, testValue)))
-                        else:
-                            query = agent.prefixQuery(safeStringFormat("AND (%s)=%s", (expressionUnescaped, testValue)))
-
+                        query = kb.injection.data[kb.technique].vector
+                        query = agent.prefixQuery(query.replace("[INFERENCE]", "(%s)=%s" % (expressionUnescaped, testValue)))
                         query = agent.suffixQuery(query)
+
                         result = Request.queryPage(agent.payload(newValue=query), timeBasedCompare=timeBasedCompare, raise404=False)
                         incrementCounter(kb.technique)
 
@@ -511,13 +508,10 @@ def blindThread():
                         subquery = queries[Backend.getIdentifiedDbms()].substring.query % (expressionUnescaped, 1, len(commonPattern))
                         testValue = unescaper.escape("'%s'" % commonPattern) if "'" not in commonPattern else unescaper.escape("%s" % commonPattern, quote=False)
 
-                        if timeBasedCompare:
-                            query = kb.injection.data[kb.technique].vector
-                            query = agent.prefixQuery(query.replace("[INFERENCE]", "(%s)=%s" % (subquery, testValue)))
-                        else:
-                            query = agent.prefixQuery(safeStringFormat("AND (%s)=%s", (subquery, testValue)))
-
+                        query = kb.injection.data[kb.technique].vector
+                        query = agent.prefixQuery(query.replace("[INFERENCE]", "(%s)=%s" % (subquery, testValue)))
                         query = agent.suffixQuery(query)
+
                         result = Request.queryPage(agent.payload(newValue=query), timeBasedCompare=timeBasedCompare, raise404=False)
                         incrementCounter(kb.technique)
 
