minor update regarding last commit (cleaner code)

stamparm · stamparm · commit 2033a28ae7c6 · 2011-07-24T20:44:17.000Z
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -1334,53 +1334,49 @@ def parseUnionPage(output, expression, partial=False, condition=None, sort=True)
 
     data = BigArray()
 
-    if isinstance(output, list):
-        for entry in output:
-            data.append(entry[0] if len(entry) == 1 else entry)            
-    else:
-        outCond1 = ( output.startswith(kb.misc.start) and output.endswith(kb.misc.stop) )
-        outCond2 = ( output.startswith(DUMP_START_MARKER) and output.endswith(DUMP_STOP_MARKER) )
-
-        if outCond1 or outCond2:
-            if outCond1:
-                regExpr = '%s(.*?)%s' % (kb.misc.start, kb.misc.stop)
-            elif outCond2:
-                regExpr = '%s(.*?)%s' % (DUMP_START_MARKER, DUMP_STOP_MARKER)
-
-            output = re.findall(regExpr, output, re.DOTALL | re.IGNORECASE)
-            if condition is None:
-                condition = (
-                            kb.resumedQueries and conf.url in kb.resumedQueries.keys()
-                            and expression in kb.resumedQueries[conf.url].keys()
-                            )
-
-            if partial or not condition:
-                logOutput = "".join(["%s%s%s" % (DUMP_START_MARKER, replaceNewlineTabs(value), DUMP_STOP_MARKER) for value in output])
-                dataToSessionFile("[%s][%s][%s][%s][%s]\n" % (conf.url, kb.injection.place, conf.parameters[kb.injection.place], expression, logOutput))
-
-            if sort:
-                dict_ = {}
-                for entry in output:
-                    dict_[entry.lower()] = entry
-                output = dict_.values()
-
+    outCond1 = ( output.startswith(kb.misc.start) and output.endswith(kb.misc.stop) )
+    outCond2 = ( output.startswith(DUMP_START_MARKER) and output.endswith(DUMP_STOP_MARKER) )
+
+    if outCond1 or outCond2:
+        if outCond1:
+            regExpr = '%s(.*?)%s' % (kb.misc.start, kb.misc.stop)
+        elif outCond2:
+            regExpr = '%s(.*?)%s' % (DUMP_START_MARKER, DUMP_STOP_MARKER)
+
+        output = re.findall(regExpr, output, re.DOTALL | re.IGNORECASE)
+        if condition is None:
+            condition = (
+                        kb.resumedQueries and conf.url in kb.resumedQueries.keys()
+                        and expression in kb.resumedQueries[conf.url].keys()
+                        )
+
+        if partial or not condition:
+            logOutput = "".join(["%s%s%s" % (DUMP_START_MARKER, replaceNewlineTabs(value), DUMP_STOP_MARKER) for value in output])
+            dataToSessionFile("[%s][%s][%s][%s][%s]\n" % (conf.url, kb.injection.place, conf.parameters[kb.injection.place], expression, logOutput))
+
+        if sort:
+            dict_ = {}
             for entry in output:
-                info = []
+                dict_[entry.lower()] = entry
+            output = dict_.values()
 
-                if DUMP_DEL_MARKER in entry:
-                    entry = entry.split(DUMP_DEL_MARKER)
-                else:
-                    entry = entry.split(kb.misc.delimiter)
+        for entry in output:
+            info = []
 
-                if len(entry) == 1:
-                    data.append(entry[0])
-                else:
-                    for value in entry:
-                        info.append(value)
+            if DUMP_DEL_MARKER in entry:
+                entry = entry.split(DUMP_DEL_MARKER)
+            else:
+                entry = entry.split(kb.misc.delimiter)
 
-                    data.append(info)
-        else:
-            data = output
+            if len(entry) == 1:
+                data.append(entry[0])
+            else:
+                for value in entry:
+                    info.append(value)
+
+                data.append(info)
+    else:
+        data = output
 
     if len(data) == 1 and isinstance(data[0], basestring):
         data = data[0]
diff --git a/lib/request/inject.py b/lib/request/inject.py
@@ -375,7 +375,7 @@ def __goInband(expression, expected=None, sort=True, resumeValue=True, unpack=Tr
 
     output = None
     partial = False
-    data = []
+    data = None
 
     if resumeValue:
         output = resume(expression, None)
@@ -386,7 +386,9 @@ def __goInband(expression, expected=None, sort=True, resumeValue=True, unpack=Tr
     if output is None:
         output = unionUse(expression, unpack=unpack, dump=dump)
 
-    if output:
+    if isinstance(output, list):
+        data = output
+    else:
         data = parseUnionPage(output, expression, partial, None, sort)
 
     return data
diff --git a/lib/techniques/union/use.py b/lib/techniques/union/use.py
@@ -309,7 +309,7 @@ def unionThread():
                             if all(map(lambda x: x in output, [kb.misc.start, kb.misc.stop])):
                                 items = extractRegexResult(r'%s(?P<result>.*?)%s' % (kb.misc.start, kb.misc.stop), output, re.DOTALL | re.IGNORECASE).split(kb.misc.delimiter)
                                 kb.locks.value.acquire()
-                                threadData.shared.value.append(items)
+                                threadData.shared.value.append(items[0] if len(items) == 1 else items)
                                 kb.locks.value.release()
                             else:
                                 items = output.replace(kb.misc.start, "").replace(kb.misc.stop, "").split(kb.misc.delimiter)
