minor update

lib/core/common.py

@@ -1651,7 +1651,7 @@ def logHTTPTraffic(requestLogMsg, responseLogMsg):
 
     kb.locks.reqLock.release()
 
-def getPublicTypeMembers(type_):
+def getPublicTypeMembers(type_, onlyValues=False):
     """
     Useful for getting members from types (e.g. in enums)
     """
@@ -1659,7 +1659,10 @@ def getPublicTypeMembers(type_):
 
     for name, value in getmembers(type_):
         if not name.startswith('__'):
-            retVal.append((name, value))
+            if not onlyValues:
+                retVal.append((name, value))
+            else:
+                retVal.append(value)
 
     return retVal
 
@@ -1743,3 +1746,11 @@ def parseSqliteTableSchema(value):
 
         table[conf.tbl] = columns
         kb.data.cachedColumns[conf.db] = table
+
+def getTechniqueData(technique=None):
+    retVal = None
+
+    if technique and technique in kb.injection.data:
+        retVal = kb.injection.data[technique]
+
+    return retVal

lib/core/session.py

@@ -358,34 +358,6 @@ def resumeConfKb(expression, url, value):
             warnMsg += "but you did not provided it this time"
             logger.warn(warnMsg)
 
-    elif expression == "Boolean-based blind injection" and url == conf.url:
-        kb.booleanTest = unSafeFormatString(value[:-1])
-
-        logMsg = "resuming boolean-based blind injection "
-        logMsg += "'%s' from session file" % kb.booleanTest
-        logger.info(logMsg)
-
-    elif expression == "Error-based injection" and url == conf.url:
-        kb.errorTest = unSafeFormatString(value[:-1])
-
-        logMsg = "resuming error-based injection "
-        logMsg += "'%s' from session file" % kb.errorTest
-        logger.info(logMsg)
-
-    elif expression == "Stacked queries" and url == conf.url:
-        kb.stackedTest = unSafeFormatString(value[:-1])
-
-        logMsg = "resuming stacked queries syntax "
-        logMsg += "'%s' from session file" % kb.stackedTest
-        logger.info(logMsg)
-
-    elif expression == "Time-based blind injection" and url == conf.url:
-        kb.timeTest = unSafeFormatString(value[:-1])
-
-        logMsg = "resuming time-based blind injection "
-        logMsg += "'%s' from session file" % kb.timeTest
-        logger.info(logMsg)
-
     elif expression == "DBMS" and url == conf.url:
         dbms        = unSafeFormatString(value[:-1])
         dbms        = dbms.lower()