improved test switch --live-test and minor refactoring

bdamele · bdamele · commit 2926c815bf9f · 2012-12-17T11:29:33.000Z
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -1731,7 +1731,7 @@ def _saveCmdline():
     infoMsg = "saved command line options on '%s' configuration file" % paths.SQLMAP_CONFIG
     logger.info(infoMsg)
 
-def _setVerbosity():
+def setVerbosity():
     """
     This function set the verbosity of sqlmap output messages.
     """
@@ -2057,7 +2057,7 @@ def init(inputOptions=AttribDict(), overrideOptions=False):
     _setKnowledgeBaseAttributes()
     _mergeOptions(inputOptions, overrideOptions)
     _useWizardInterface()
-    _setVerbosity()
+    setVerbosity()
     _saveCmdline()
     _setRequestFromFile()
     _cleanupOptions()
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -462,7 +462,7 @@
 CHECK_ZERO_COLUMNS_THRESHOLD = 10
 
 # Boldify all logger messages containing these "patterns"
-BOLD_PATTERNS = ("' injectable", "might be injectable", "' is vulnerable", "is not injectable")
+BOLD_PATTERNS = ("' injectable", "might be injectable", "' is vulnerable", "is not injectable", "test failed", "test passed")
 
 # Generic www root directory names
 GENERIC_DOC_ROOT_DIRECTORY_NAMES = ("htdocs", "wwwroot", "www")
diff --git a/lib/core/testing.py b/lib/core/testing.py
@@ -22,7 +22,7 @@
 from lib.core.data import logger
 from lib.core.data import paths
 from lib.core.option import init
-from lib.core.option import _setVerbosity
+from lib.core.option import setVerbosity
 from lib.core.optiondict import optDict
 from lib.parse.cmdline import cmdLineParser
 
@@ -118,39 +118,42 @@ def liveTest():
 
     for case in livetests.getElementsByTagName("case"):
         count += 1
-
-        if conf.runCase and conf.runCase != count:
-            continue
-
         name = None
-        log = []
+        parse = []
         switches = dict(global_)
 
         if case.hasAttribute("name"):
             name = case.getAttribute("name")
 
+        if conf.runCase and ((conf.runCase.isdigit() and conf.runCase != count) or not re.search(conf.runCase, name, re.DOTALL)):
+            continue
+
         if case.getElementsByTagName("switches"):
             for child in case.getElementsByTagName("switches")[0].childNodes:
                 if child.nodeType == child.ELEMENT_NODE and child.hasAttribute("value"):
                     value = replaceVars(child.getAttribute("value"), vars_)
                     switches[child.tagName] = adjustValueType(child.tagName, value)
 
-        if case.getElementsByTagName("log"):
-            for item in case.getElementsByTagName("log")[0].getElementsByTagName("item"):
+        if case.getElementsByTagName("parse"):
+            for item in case.getElementsByTagName("parse")[0].getElementsByTagName("item"):
                 if item.hasAttribute("value"):
-                    log.append(replaceVars(item.getAttribute("value"), vars_))
+                    parse.append(replaceVars(item.getAttribute("value"), vars_))
 
         msg = "running live test case '%s' (%d/%d)" % (name, count, length)
         logger.info(msg)
-        result = runCase(switches, log)
+
+        result = runCase(switches, parse)
+
         if result:
             logger.info("test passed")
         else:
             logger.error("test failed")
             beep()
+
         retVal &= result
 
     dataToStdout("\n")
+
     if retVal:
         logger.info("live test final result: PASSED")
     else:
@@ -159,9 +162,12 @@ def liveTest():
     return retVal
 
 def initCase(switches=None):
-    paths.SQLMAP_OUTPUT_PATH = tempfile.mkdtemp()
+    paths.SQLMAP_OUTPUT_PATH = tempfile.mkdtemp(prefix="sqlmaptest-")
     paths.SQLMAP_DUMP_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "dump")
     paths.SQLMAP_FILES_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "files")
+
+    logger.debug("using output directory '%s' for this test case" % paths.SQLMAP_OUTPUT_PATH)
+
     cmdLineOptions = cmdLineParser()
     cmdLineOptions.liveTest = cmdLineOptions.smokeTest = False
 
@@ -171,29 +177,29 @@ def initCase(switches=None):
                 cmdLineOptions.__dict__[key] = value
 
     init(cmdLineOptions, True)
-    _setVerbosity()
+    conf.verbose = 0
+    setVerbosity()
 
 def cleanCase():
     shutil.rmtree(paths.SQLMAP_OUTPUT_PATH, True)
-    paths.SQLMAP_OUTPUT_PATH = os.path.join(paths.SQLMAP_ROOT_PATH, "output")
-    paths.SQLMAP_DUMP_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "dump")
-    paths.SQLMAP_FILES_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "files")
     conf.verbose = 1
-    _setVerbosity()
+    setVerbosity()
 
-def runCase(switches=None, log=None):
+def runCase(switches=None, parse=None):
     retVal = True
     initCase(switches)
 
     result = start()
-    if result == False: #if None ignore
+
+    if result == False: # if None, ignore
+        logger.error("the test did not run")
         retVal = False
 
-    if log and retVal:
+    if parse and retVal:
         ifile = open(conf.dumper.getOutputFile(), 'r')
         content = ifile.read()
         ifile.close()
-        for item in log:
+        for item in parse:
             if item.startswith("r'") and item.endswith("'"):
                 if not re.search(item[2:-1], content, re.DOTALL):
                     retVal = False
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
@@ -679,8 +679,7 @@ def cmdLineParser():
         parser.add_option("--live-test", dest="liveTest", action="store_true",
                           help=SUPPRESS_HELP)
 
-        parser.add_option("--run-case", dest="runCase", type="int",
-                          help=SUPPRESS_HELP)
+        parser.add_option("--run-case", dest="runCase", help=SUPPRESS_HELP)
 
         parser.add_option("--restapi", dest="restApi", action="store_true",
                           help=SUPPRESS_HELP)
diff --git a/xml/livetests.xml b/xml/livetests.xml
