Code cleanup and minor refactoring

bdamele · bdamele · commit a9d4b3798760 · 2010-12-03T10:51:27.000Z
diff --git a/lib/core/session.py b/lib/core/session.py
@@ -361,7 +361,7 @@ def resumeConfKb(expression, url, value):
         injection = base64unpickle(value[:-1])
         kb.injections.append(injection)
 
-        logMsg = "resuming injection data"
+        logMsg = "resuming injection data from session file"
         logger.info(logMsg)
 
     elif expression == "Boolean-based blind injection" and url == conf.url:
diff --git a/lib/parse/payloads.py b/lib/parse/payloads.py
@@ -13,33 +13,40 @@
 from lib.core.data import paths
 from lib.core.datatype import advancedDict
 
-def cleanupVals(values, tag):
-    if isinstance(values, basestring):
-        return values
+def cleanupVals(text, tag):
+    if tag in ("clause", "where"):
+        text = text.split(',')
 
-    count = 0
-
-    for value in values:
-        if value.isdigit():
-            value = int(value)
+    if isinstance(text, basestring):
+        if text.isdigit():
+            text = int(text)
         else:
-            value = str(value)
+            text = str(text)
+
+    elif isinstance(text, list):
+        count = 0
+
+        for t in text:
+            if t.isdigit():
+                t = int(t)
+            else:
+                t = str(t)
 
-        values[count] = value
-        count += 1
+            text[count] = t
+            count += 1
 
-    if len(values) == 1 and tag not in ("clause", "where"):
-        values = values[0]
+        if len(text) == 1 and tag not in ("clause", "where"):
+            text = text[0]
 
-    return values
+    return text
 
 def parseXmlNode(node):
     for element in node.getiterator('boundary'):
         boundary = advancedDict()
 
         for child in element.getchildren():
             if child.text:
-                values = cleanupVals(child.text.split(','), child.tag)
+                values = cleanupVals(child.text, child.tag)
                 boundary[child.tag] = values
             else:
                 boundary[child.tag] = None
@@ -51,7 +58,7 @@ def parseXmlNode(node):
 
         for child in element.getchildren():
             if child.text and child.text.strip():
-                values = cleanupVals(child.text.split(',') if child.tag != "epayload" else child.text, child.tag)
+                values = cleanupVals(child.text, child.tag)
                 test[child.tag] = values
             else:
                 if len(child.getchildren()) == 0:
diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py
@@ -23,7 +23,6 @@
 from lib.core.session import setError
 from lib.core.unescaper import unescaper
 from lib.request.connect import Connect as Request
-from lib.utils.resume import resume
 
 from lib.core.settings import ERROR_SPACE
 from lib.core.settings import ERROR_EMPTY_CHAR
