minor refactoring

bdamele · bdamele · commit 31571e6e2dfb · 2012-07-11T11:55:05.000+01:00
diff --git a/lib/request/inject.py b/lib/request/inject.py
@@ -54,41 +54,43 @@
 from lib.techniques.error.use import errorUse
 from lib.techniques.union.use import unionUse
 
+def __goDns(payload, expression):
+    value = None
+
+    if conf.dName and kb.dnsTest is not False:
+        if kb.dnsTest is None:
+            dnsTest(payload)
+
+        if kb.dnsTest:
+            value = dnsUse(payload, expression)
+
+    return value
+
 def __goInference(payload, expression, charsetType=None, firstChar=None, lastChar=None, dump=False):
     start = time.time()
     value = None
     count = 0
 
     value = __goDns(payload, expression)
 
-    if value is None:
-        timeBasedCompare = (kb.technique in (PAYLOAD.TECHNIQUE.TIME, PAYLOAD.TECHNIQUE.STACKED))
+    if value:
+        return value
 
-        if not (timeBasedCompare and kb.dnsTest):
-            if (conf.eta or conf.threads > 1) and Backend.getIdentifiedDbms() and not timeBasedCompare:
-                _, length, _ = queryOutputLength(expression, payload)
-            else:
-                length = None
+    timeBasedCompare = (kb.technique in (PAYLOAD.TECHNIQUE.TIME, PAYLOAD.TECHNIQUE.STACKED))
 
-            kb.inferenceMode = True
-            count, value = bisection(payload, expression, length, charsetType, firstChar, lastChar, dump)
-            kb.inferenceMode = False
-
-            if not kb.bruteMode:
-                debugMsg = "performed %d queries in %d seconds" % (count, calculateDeltaSeconds(start))
-                logger.debug(debugMsg)
-
-    return value
-
-def __goDns(payload, expression):
-    value = None
+    if not (timeBasedCompare and kb.dnsTest):
+        if (conf.eta or conf.threads > 1) and Backend.getIdentifiedDbms() and not timeBasedCompare:
+            _, length, _ = queryOutputLength(expression, payload)
+        else:
+            length = None
 
-    if conf.dName and kb.dnsTest is not False:
-        if kb.dnsTest is None:
-            dnsTest(payload)
+        kb.inferenceMode = True
+        count, value = bisection(payload, expression, length, charsetType, firstChar, lastChar, dump)
+        kb.inferenceMode = False
 
-        if kb.dnsTest:
-            value = dnsUse(payload, expression)
+        if not kb.bruteMode:
+            debugMsg = "performed %d queries in %d seconds" % (count, calculateDeltaSeconds(start))
+            logger.debug(debugMsg)
 
     return value
 
