From 29a65b5cdc8f82360539dfd9314f0bea1aa14fa7 Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Tue, 22 Jan 2013 11:23:48 +0000
Subject: [PATCH 1/4] added Firebird search test cases

---
 xml/livetests.xml | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/xml/livetests.xml b/xml/livetests.xml
index 0f3aa26b7..56d7a0cd3 100644
--- a/xml/livetests.xml
+++ b/xml/livetests.xml
@@ -2622,6 +2622,50 @@
             <item value="r'SELECT \* FROM users ORDER BY name \[5\].+1, luther, blisset.+2, fluffy, bunny.+3, wu, ming'"/>
         </parse>
     </case>
+    <case name="Firebird boolean-based multi-threaded custom SQL query enumeration">
+        <switches>
+            <url value="http://debiandev/sqlmap/firebird/get_int.php?id=1"/>
+            <threads value="4"/>
+            <tech value="B"/>
+            <query value="SELECT * FROM users"/>
+        </switches>
+        <parse>
+            <item value="r'SELECT \* FROM users \[.+1, luther, blisset.+2, fluffy, bunny'"/>
+        </parse>
+    </case>
+    <case name="Firebird UNION query multi-threaded custom SQL query enumeration">
+        <switches>
+            <url value="http://debiandev/sqlmap/firebird/get_int.php?id=1"/>
+            <threads value="4"/>
+            <tech value="U"/>
+            <query value="SELECT * FROM users"/>
+        </switches>
+        <parse>
+            <item value="r'SELECT \* FROM users \[.+1, luther, blisset.+2, fluffy, bunny'"/>
+        </parse>
+    </case>
+    <case name="Firebird boolean-based multi-threaded custom ordered SQL query enumeration">
+        <switches>
+            <url value="http://debiandev/sqlmap/firebird/get_int.php?id=1"/>
+            <threads value="4"/>
+            <tech value="B"/>
+            <query value="SELECT * FROM users ORDER BY name"/>
+        </switches>
+        <parse>
+            <item value="r'SELECT \* FROM users ORDER BY name \[5\].+2, fluffy, bunny.+1, luther, blisset.+3, wu, ming'"/>
+        </parse>
+    </case>
+    <case name="Firebird UNION query multi-threaded custom ordered SQL query enumeration">
+        <switches>
+            <url value="http://debiandev/sqlmap/firebird/get_int.php?id=1"/>
+            <threads value="4"/>
+            <tech value="U"/>
+            <query value="SELECT * FROM users ORDER BY name"/>
+        </switches>
+        <parse>
+            <item value="r'SELECT \* FROM users ORDER BY name \[5\].+1, luther, blisset.+2, fluffy, bunny.+3, wu, ming'"/>
+        </parse>
+    </case>
     <!-- End of user's provided statement enumeration switches -->
 
     <!-- File system access switches -->

From 061aef57baa7d07d4edfe2861fec042e2093b654 Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Tue, 22 Jan 2013 11:25:01 +0000
Subject: [PATCH 2/4] missing import

---
 lib/core/testing.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/core/testing.py b/lib/core/testing.py
index 137b0a7fb..ab502ba7f 100644
--- a/lib/core/testing.py
+++ b/lib/core/testing.py
@@ -26,6 +26,7 @@ from lib.core.data import conf
 from lib.core.data import logger
 from lib.core.data import paths
 from lib.core.exception import SqlmapBaseException
+from lib.core.exception import SqlmapNotVulnerableException
 from lib.core.log import LOGGER_HANDLER
 from lib.core.option import init
 from lib.core.optiondict import optDict

From afa9046e74b2f810c2cf2ee7a18a9642757150ca Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Tue, 22 Jan 2013 12:34:11 +0000
Subject: [PATCH 3/4] added Firebird custom enumeration test cases and stricten
 a few cases to make sure query length calculation function works properly
 with multi-threading/boolean technique

---
 xml/livetests.xml | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/xml/livetests.xml b/xml/livetests.xml
index 56d7a0cd3..085fd10e5 100644
--- a/xml/livetests.xml
+++ b/xml/livetests.xml
@@ -1150,6 +1150,7 @@
             <lastChar value="5"/>
         </switches>
         <parse>
+            <item value="r'fetching number of entries for table .+retrieving the length of query output\n[\r]*\[.+?\] \[INFO\] retrieved: [\d]+'" console_output="True"/>
             <item value="r'Database: testdb.+Table: users.+5 entries.+the     | iss.+&lt;blank&gt; | mei'"/>
         </parse>
     </case>
@@ -1201,6 +1202,7 @@
             <lastChar value="5"/>
         </switches>
         <parse>
+            <item value="r'fetching number of entries for table .+retrieving the length of query output\n[\r]*\[.+?\] \[INFO\] retrieved: [\d]+'" console_output="True"/>
             <item value="r'Database: public.+Table: users.+5 entries.+the     | iss.+&lt;blank&gt; | mei'"/>
         </parse>
     </case>
@@ -1252,6 +1254,7 @@
             <lastChar value="5"/>
         </switches>
         <parse>
+            <item value="r'fetching number of entries for table .+retrieving the length of query output\n[\r]*\[.+?\] \[INFO\] retrieved: [\d]+'" console_output="True"/>
             <item value="r'Database: SYS.+Table: USERS.+5 entries.+the     | iss.+&lt;blank&gt; | mei'"/>
         </parse>
     </case>
@@ -1267,6 +1270,7 @@
             <lastChar value="5"/>
         </switches>
         <parse>
+            <item value="r'fetching number of entries for table .+retrieving the length of query output\n[\r]*\[.+?\] \[INFO\] retrieved: [\d]+'" console_output="True"/>
             <item value="r'Database: DB2INST1.+Table: USERS.+5 entries.+the  | iss.+NULL | mei'"/>
         </parse>
     </case>
@@ -1277,7 +1281,6 @@
             <tech value="U"/>
             <getSchema value="True"/>
             <dumpTable value="True"/>
-            <db value="testdb"/>
             <tbl value="users"/>
             <limitStart value="2"/>
             <limitStop value="4"/>
@@ -1294,15 +1297,47 @@
             <threads value="4"/>
             <tech value="B"/>
             <dumpTable value="True"/>
-            <db value="testdb"/>
             <tbl value="users"/>
             <firstChar value="3"/>
             <lastChar value="5"/>
         </switches>
         <parse>
+            <item value="r'fetching number of entries for table .+retrieving the length of query output\n[\r]*\[.+?\] \[INFO\] retrieved: [\d]+'" console_output="True"/>
             <item value="r'Database: SQLite_masterdb.+Table: users.+5 entries.+the     | iss.+&lt;blank&gt; | mei'"/>
         </parse>
     </case>
+    <case name="Fiebird UNION query multi-threaded custom enumeration">
+        <switches>
+            <url value="http://debiandev/sqlmap/firebird/get_int.php?id=1"/>
+            <threads value="4"/>
+            <tech value="U"/>
+            <getSchema value="True"/>
+            <dumpTable value="True"/>
+            <tbl value="users"/>
+            <limitStart value="2"/>
+            <limitStop value="4"/>
+            <excludeSysDbs value="True"/>
+        </switches>
+        <parse>
+            <item value="r'Database: Fiebird_masterdb.+Table: USERS.+3 columns.+surname.+VARCHAR'"/>
+            <item value="r'Database: Fiebird_masterdb.+Table: USERS.+3 entries.+fluffy.+bunny.+wu.+ming'"/>
+        </parse>
+    </case>
+    <case name="Fiebird boolean-based multi-threaded custom enumeration - substring">
+        <switches>
+            <url value="http://debiandev/sqlmap/firebird/get_int.php?id=1"/>
+            <threads value="4"/>
+            <tech value="B"/>
+            <dumpTable value="True"/>
+            <tbl value="users"/>
+            <firstChar value="3"/>
+            <lastChar value="5"/>
+        </switches>
+        <parse>
+            <item value="r'fetching number of entries for table .+retrieving the length of query output\n[\r]*\[.+?\] \[INFO\] retrieved: [\d]+'" console_output="True"/>
+            <item value="r'Database: Fiebird_masterdb.+Table: USERS.+5 entries.+the .+| iss.+   | mei'"/>
+        </parse>
+    </case>
     <!-- End of custom enumeration switches -->
 
     <!-- Search enumeration switches -->

From 4f081a6a9b1717101e63c0b4e05bd0837f773c3f Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Tue, 22 Jan 2013 13:00:15 +0000
Subject: [PATCH 4/4] typo fixes

---
 xml/livetests.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xml/livetests.xml b/xml/livetests.xml
index 085fd10e5..f669d1102 100644
--- a/xml/livetests.xml
+++ b/xml/livetests.xml
@@ -1306,7 +1306,7 @@
             <item value="r'Database: SQLite_masterdb.+Table: users.+5 entries.+the     | iss.+&lt;blank&gt; | mei'"/>
         </parse>
     </case>
-    <case name="Fiebird UNION query multi-threaded custom enumeration">
+    <case name="Firebird UNION query multi-threaded custom enumeration">
         <switches>
             <url value="http://debiandev/sqlmap/firebird/get_int.php?id=1"/>
             <threads value="4"/>
@@ -1319,11 +1319,11 @@
             <excludeSysDbs value="True"/>
         </switches>
         <parse>
-            <item value="r'Database: Fiebird_masterdb.+Table: USERS.+3 columns.+surname.+VARCHAR'"/>
-            <item value="r'Database: Fiebird_masterdb.+Table: USERS.+3 entries.+fluffy.+bunny.+wu.+ming'"/>
+            <item value="r'Database: Firebird_masterdb.+Table: USERS.+3 columns.+SURNAME.+VARCHAR'"/>
+            <item value="r'Database: Firebird_masterdb.+Table: USERS.+3 entries.+fluffy.+bunny.+wu.+ming'"/>
         </parse>
     </case>
-    <case name="Fiebird boolean-based multi-threaded custom enumeration - substring">
+    <case name="Firebird boolean-based multi-threaded custom enumeration - substring">
         <switches>
             <url value="http://debiandev/sqlmap/firebird/get_int.php?id=1"/>
             <threads value="4"/>
@@ -1335,7 +1335,7 @@
         </switches>
         <parse>
             <item value="r'fetching number of entries for table .+retrieving the length of query output\n[\r]*\[.+?\] \[INFO\] retrieved: [\d]+'" console_output="True"/>
-            <item value="r'Database: Fiebird_masterdb.+Table: USERS.+5 entries.+the .+| iss.+   | mei'"/>
+            <item value="r'Database: Firebird_masterdb.+Table: USERS.+5 entries.+the .+| iss.+   | mei'"/>
         </parse>
     </case>
     <!-- End of custom enumeration switches -->