From bbd2adb5fb51bb3458910c432f33458e6738b805 Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Mon, 17 Dec 2012 11:41:43 +0000
Subject: [PATCH] improvements to --live-test and added --stop-fail switch

---
 lib/core/testing.py  | 16 ++++++++++++--
 lib/parse/cmdline.py |  3 +++
 xml/livetests.xml    | 50 ++++++++++++++++++++++----------------------
 3 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/lib/core/testing.py b/lib/core/testing.py
index 2b209868d..32659785a 100644
--- a/lib/core/testing.py
+++ b/lib/core/testing.py
@@ -26,6 +26,8 @@ from lib.core.option import setVerbosity
 from lib.core.optiondict import optDict
 from lib.parse.cmdline import cmdLineParser
 
+failedItem = None
+
 def smokeTest():
     """
     This will run the basic smoke testing of a program
@@ -95,6 +97,8 @@ def liveTest():
     """
     This will run the test of a program against the live testing environment
     """
+    global failedItem
+
     retVal = True
     count = 0
     global_ = {}
@@ -147,8 +151,10 @@ def liveTest():
         if result:
             logger.info("test passed")
         else:
-            logger.error("test failed")
+            logger.error("test failed at parsing item '%s'" % failedItem)
             beep()
+            if conf.stopFail is True:
+                return retVal
 
         retVal &= result
 
@@ -162,6 +168,9 @@ def liveTest():
     return retVal
 
 def initCase(switches=None):
+    global failedItem
+    failedItem = None
+
     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")
@@ -187,8 +196,9 @@ def cleanCase():
 
 def runCase(switches=None, parse=None):
     retVal = True
-    initCase(switches)
+    global failedItem
 
+    initCase(switches)
     result = start()
 
     if result == False: # if None, ignore
@@ -203,9 +213,11 @@ def runCase(switches=None, parse=None):
             if item.startswith("r'") and item.endswith("'"):
                 if not re.search(item[2:-1], content, re.DOTALL):
                     retVal = False
+                    failedItem = item
                     break
             elif content.find(item) < 0:
                 retVal = False
+                failedItem = item
                 break
 
     cleanCase()
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index e717d7152..b3a01a8d5 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -679,6 +679,9 @@ def cmdLineParser():
         parser.add_option("--live-test", dest="liveTest", action="store_true",
                           help=SUPPRESS_HELP)
 
+        parser.add_option("--stop-fail", dest="stopFail", action="store_true",
+                          help=SUPPRESS_HELP)
+
         parser.add_option("--run-case", dest="runCase", help=SUPPRESS_HELP)
 
         parser.add_option("--restapi", dest="restApi", action="store_true",
diff --git a/xml/livetests.xml b/xml/livetests.xml
index 86e7d9a53..ec1928bfe 100644
--- a/xml/livetests.xml
+++ b/xml/livetests.xml
@@ -49,14 +49,14 @@
             <dumpTable value="True"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
-            <item value="banner:    '5.1.41-3~bpo50+1'"/>
+            <item value="current user is DBA:    True"/>
+            <item value="banner:    '5.1.63-0+squeeze2'"/>
             <item value="current user:    'root@localhost'"/>
             <item value="current database:    'testdb'"/>
             <item value="r'information_schema.+mysql.+owasp10.+testdb'"/>
             <item value="r'1 table.+users'"/>
             <item value="r'3 columns.+surname.+varchar\(1000\)'"/>
-            <item value="r'4 entries.+nameisnull.+'"/>
+            <item value="r'5 entries.+nameisnull.+'"/>
         </parse>
     </case>
     <case name="MySQL (--technique=U --is-dba --banner --current-user --current-db --dbs --tables -D testdb -T users --columns --dump)">
@@ -75,14 +75,14 @@
             <dumpTable value="True"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
-            <item value="banner:    '5.1.41-3~bpo50+1'"/>
+            <item value="current user is DBA:    True"/>
+            <item value="banner:    '5.1.63-0+squeeze1'"/>
             <item value="current user:    'root@localhost'"/>
             <item value="current database:    'testdb'"/>
             <item value="r'information_schema.+mysql.+owasp10.+testdb'"/>
             <item value="r'1 table.+users'"/>
             <item value="r'3 columns.+surname.+varchar\(1000\)'"/>
-            <item value="r'4 entries.+nameisnull.+'"/>
+            <item value="r'5 entries.+nameisnull.+'"/>
         </parse>
     </case>
     <case name="MySQL partial union (--technique=U --is-dba --banner --current-user --current-db --dbs --tables -D testdb -T users --columns --dump)">
@@ -101,14 +101,14 @@
             <dumpTable value="True"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
-            <item value="banner:    '5.1.41-3~bpo50+1'"/>
+            <item value="current user is DBA:    True"/>
+            <item value="banner:    '5.1.63-0+squeeze1'"/>
             <item value="current user:    'root@localhost'"/>
             <item value="current database:    'testdb'"/>
             <item value="r'information_schema.+mysql.+owasp10.+testdb'"/>
             <item value="r'1 table.+users'"/>
             <item value="r'3 columns.+surname.+varchar\(1000\)'"/>
-            <item value="r'4 entries.+nameisnull.+'"/>
+            <item value="r'5 entries.+nameisnull.+'"/>
         </parse>
     </case>
     <case name="Postgres (--technique=B --is-dba --banner --current-user --current-db --dbs --tables -D testdb -T users --columns --dump --threads=4)">
@@ -128,7 +128,7 @@
             <threads value="4"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
+            <item value="current user is DBA:    True"/>
             <item value="PostgreSQL 8.3.9 on i486-pc-linux-gnu, compiled by GCC gcc-4.3.real (Debian 4.3.2-1.1) 4.3.2"/>
             <item value="current user:    'testuser'"/>
             <item value="current database:    'testdb'"/>
@@ -154,7 +154,7 @@
             <dumpTable value="True"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
+            <item value="current user is DBA:    True"/>
             <item value="PostgreSQL 8.3.9 on i486-pc-linux-gnu, compiled by GCC gcc-4.3.real (Debian 4.3.2-1.1) 4.3.2"/>
             <item value="current user:    'testuser'"/>
             <item value="current database:    'testdb'"/>
@@ -180,7 +180,7 @@
             <dumpTable value="True"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
+            <item value="current user is DBA:    True"/>
             <item value="PostgreSQL 8.3.9 on i486-pc-linux-gnu, compiled by GCC gcc-4.3.real (Debian 4.3.2-1.1) 4.3.2"/>
             <item value="current user:    'testuser'"/>
             <item value="current database:    'testdb'"/>
@@ -206,7 +206,7 @@
             <dumpTable value="True"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
+            <item value="current user is DBA:    True"/>
             <item value="PostgreSQL 8.3.9 on i486-pc-linux-gnu, compiled by GCC gcc-4.3.real (Debian 4.3.2-1.1) 4.3.2"/>
             <item value="current user:    'testuser'"/>
             <item value="current database:    'testdb'"/>
@@ -233,7 +233,7 @@
             <threads value="4"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
+            <item value="current user is DBA:    True"/>
             <item value="banner:    'Oracle Database 10g Enterprise Edition Release 10.2.0.1.0 - Prod'"/>
             <item value="current user:    'SYS'"/>
             <item value="'TESTDB.REGRESS.RDBMS.DEV.US.ORACLE.COM'"/>
@@ -259,7 +259,7 @@
             <dumpTable value="True"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
+            <item value="current user is DBA:    True"/>
             <item value="banner:    'Oracle Database 10g Enterprise Edition Release 10.2.0.1.0 - Prod'"/>
             <item value="current user:    'SYS'"/>
             <item value="'TESTDB.REGRESS.RDBMS.DEV.US.ORACLE.COM'"/>
@@ -285,7 +285,7 @@
             <dumpTable value="True"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
+            <item value="current user is DBA:    True"/>
             <item value="banner:    'Oracle Database 10g Enterprise Edition Release 10.2.0.1.0 - Prod'"/>
             <item value="current user:    'SYS'"/>
             <item value="'TESTDB.REGRESS.RDBMS.DEV.US.ORACLE.COM'"/>
@@ -311,7 +311,7 @@
             <dumpTable value="True"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
+            <item value="current user is DBA:    True"/>
             <item value="banner:    'Oracle Database 10g Enterprise Edition Release 10.2.0.1.0 - Prod'"/>
             <item value="current user:    'SYS'"/>
             <item value="'TESTDB.REGRESS.RDBMS.DEV.US.ORACLE.COM'"/>
@@ -338,14 +338,14 @@
             <threads value="4"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
+            <item value="current user is DBA:    True"/>
             <item value="r'Microsoft SQL Server 2005.+Oct 14 2005 00:33:37'"/>
             <item value="current user:    'sa'"/>
             <item value="current database:    'testdb'"/>
             <item value="r'available databases.+5.+master.+model.+msdb.+tempdb.+testdb'"/>
             <item value="r'dbo\.sysdiagrams.+dbo\.users'"/>
             <item value="r'3 columns.+surname.+varchar'"/>
-            <item value="r'4 entries.+nameisnull.+'"/>
+            <item value="r'5 entries.+nameisnull.+'"/>
         </parse>
     </case>
     <case name="MSSQL (--technique=E --is-dba --banner --current-user --current-db --dbs --tables -D testdb -T users --columns --dump)">
@@ -364,14 +364,14 @@
             <dumpTable value="True"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
+            <item value="current user is DBA:    True"/>
             <item value="r'Microsoft SQL Server 2005.+Oct 14 2005 00:33:37'"/>
             <item value="current user:    'sa'"/>
             <item value="current database:    'testdb'"/>
             <item value="r'available databases.+5.+master.+model.+msdb.+tempdb.+testdb'"/>
             <item value="r'dbo\.sysdiagrams.+dbo\.users'"/>
             <item value="r'3 columns.+surname.+varchar'"/>
-            <item value="r'4 entries.+nameisnull.+'"/>
+            <item value="r'5 entries.+nameisnull.+'"/>
         </parse>
     </case>
     <case name="MSSQL (--technique=U --is-dba --banner --current-user --current-db --dbs --tables -D testdb -T users --columns --dump)">
@@ -390,14 +390,14 @@
             <dumpTable value="True"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
+            <item value="current user is DBA:    True"/>
             <item value="r'Microsoft SQL Server 2005.+Oct 14 2005 00:33:37'"/>
             <item value="current user:    'sa'"/>
             <item value="current database:    'testdb'"/>
             <item value="r'available databases.+5.+master.+model.+msdb.+tempdb.+testdb'"/>
             <item value="r'dbo\.sysdiagrams.+dbo\.users'"/>
             <item value="r'3 columns.+surname.+varchar'"/>
-            <item value="r'4 entries.+nameisnull.+'"/>
+            <item value="r'5 entries.+nameisnull.+'"/>
         </parse>
     </case>
     <case name="MSSQL partial union (--technique=U --is-dba --banner --current-user --current-db --dbs --tables -D testdb -T users --columns --dump)">
@@ -416,14 +416,14 @@
             <dumpTable value="True"/>
         </switches>
         <parse>
-            <item value="current user is DBA:    'True'"/>
+            <item value="current user is DBA:    True"/>
             <item value="r'Microsoft SQL Server 2005.+Oct 14 2005 00:33:37'"/>
             <item value="current user:    'sa'"/>
             <item value="current database:    'testdb'"/>
             <item value="r'available databases.+5.+master.+model.+msdb.+tempdb.+testdb'"/>
             <item value="r'dbo\.sysdiagrams.+dbo\.users'"/>
             <item value="r'3 columns.+surname.+varchar'"/>
-            <item value="r'4 entries.+nameisnull.+'"/>
+            <item value="r'5 entries.+nameisnull.+'"/>
         </parse>
     </case>
 </root>