Merge branch 'master' of github.com:sqlmapproject/sqlmap

This commit is contained in:
Miroslav Stampar 2013-01-22 14:08:31 +01:00
commit 09c02c6c72
2 changed files with 82 additions and 2 deletions

View File

@ -26,6 +26,7 @@ from lib.core.data import conf
from lib.core.data import logger from lib.core.data import logger
from lib.core.data import paths from lib.core.data import paths
from lib.core.exception import SqlmapBaseException from lib.core.exception import SqlmapBaseException
from lib.core.exception import SqlmapNotVulnerableException
from lib.core.log import LOGGER_HANDLER from lib.core.log import LOGGER_HANDLER
from lib.core.option import init from lib.core.option import init
from lib.core.optiondict import optDict from lib.core.optiondict import optDict

View File

@ -1150,6 +1150,7 @@
<lastChar value="5"/> <lastChar value="5"/>
</switches> </switches>
<parse> <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'"/> <item value="r'Database: testdb.+Table: users.+5 entries.+the | iss.+&lt;blank&gt; | mei'"/>
</parse> </parse>
</case> </case>
@ -1201,6 +1202,7 @@
<lastChar value="5"/> <lastChar value="5"/>
</switches> </switches>
<parse> <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'"/> <item value="r'Database: public.+Table: users.+5 entries.+the | iss.+&lt;blank&gt; | mei'"/>
</parse> </parse>
</case> </case>
@ -1252,6 +1254,7 @@
<lastChar value="5"/> <lastChar value="5"/>
</switches> </switches>
<parse> <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'"/> <item value="r'Database: SYS.+Table: USERS.+5 entries.+the | iss.+&lt;blank&gt; | mei'"/>
</parse> </parse>
</case> </case>
@ -1267,6 +1270,7 @@
<lastChar value="5"/> <lastChar value="5"/>
</switches> </switches>
<parse> <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'"/> <item value="r'Database: DB2INST1.+Table: USERS.+5 entries.+the | iss.+NULL | mei'"/>
</parse> </parse>
</case> </case>
@ -1277,7 +1281,6 @@
<tech value="U"/> <tech value="U"/>
<getSchema value="True"/> <getSchema value="True"/>
<dumpTable value="True"/> <dumpTable value="True"/>
<db value="testdb"/>
<tbl value="users"/> <tbl value="users"/>
<limitStart value="2"/> <limitStart value="2"/>
<limitStop value="4"/> <limitStop value="4"/>
@ -1294,15 +1297,47 @@
<threads value="4"/> <threads value="4"/>
<tech value="B"/> <tech value="B"/>
<dumpTable value="True"/> <dumpTable value="True"/>
<db value="testdb"/>
<tbl value="users"/> <tbl value="users"/>
<firstChar value="3"/> <firstChar value="3"/>
<lastChar value="5"/> <lastChar value="5"/>
</switches> </switches>
<parse> <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'"/> <item value="r'Database: SQLite_masterdb.+Table: users.+5 entries.+the | iss.+&lt;blank&gt; | mei'"/>
</parse> </parse>
</case> </case>
<case name="Firebird 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: 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="Firebird 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: Firebird_masterdb.+Table: USERS.+5 entries.+the .+| iss.+ | mei'"/>
</parse>
</case>
<!-- End of custom enumeration switches --> <!-- End of custom enumeration switches -->
<!-- Search enumeration switches --> <!-- Search enumeration switches -->
@ -2622,6 +2657,50 @@
<item value="r'SELECT \* FROM users ORDER BY name \[5\].+1, luther, blisset.+2, fluffy, bunny.+3, wu, ming'"/> <item value="r'SELECT \* FROM users ORDER BY name \[5\].+1, luther, blisset.+2, fluffy, bunny.+3, wu, ming'"/>
</parse> </parse>
</case> </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 --> <!-- End of user's provided statement enumeration switches -->
<!-- File system access switches --> <!-- File system access switches -->