update

stamparm · stamparm · commit e17ac5fdca18 · 2011-01-15T15:14:22.000Z
diff --git a/lib/core/agent.py b/lib/core/agent.py
@@ -27,6 +27,7 @@
 from lib.core.enums import PAYLOAD
 from lib.core.enums import PLACE
 from lib.core.exception import sqlmapNoneDataException
+from lib.core.settings import INBAND_FROM_TABLE
 from lib.core.settings import PAYLOAD_DELIMITER
 
 class Agent:
@@ -515,8 +516,8 @@ def forgeInbandQuery(self, query, position, count, comment, prefix, suffix, char
             intoRegExp = intoRegExp.group(1)
             query = query[:query.index(intoRegExp)]
 
-        if getIdentifiedDBMS() == DBMS.ORACLE and inbandQuery.endswith(" FROM DUAL"):
-            inbandQuery = inbandQuery[:-len(" FROM DUAL")]
+        if getIdentifiedDBMS() in INBAND_FROM_TABLE and inbandQuery.endswith(INBAND_FROM_TABLE[getIdentifiedDBMS()]):
+            inbandQuery = inbandQuery[:-len(INBAND_FROM_TABLE[getIdentifiedDBMS()])]
 
         for element in range(count):
             if element > 0:
@@ -535,9 +536,9 @@ def forgeInbandQuery(self, query, position, count, comment, prefix, suffix, char
             conditionIndex = query.index(" FROM ")
             inbandQuery += query[conditionIndex:]
 
-        if getIdentifiedDBMS() == DBMS.ORACLE:
+        if getIdentifiedDBMS() in INBAND_FROM_TABLE:
             if " FROM " not in inbandQuery:
-                inbandQuery += " FROM DUAL"
+                inbandQuery += INBAND_FROM_TABLE[getIdentifiedDBMS()]
 
         if intoRegExp:
             inbandQuery += intoRegExp
@@ -554,8 +555,8 @@ def forgeInbandQuery(self, query, position, count, comment, prefix, suffix, char
                 else:
                     inbandQuery += char
 
-            if getIdentifiedDBMS() == DBMS.ORACLE:
-                inbandQuery += " FROM DUAL"
+            if getIdentifiedDBMS() in INBAND_FROM_TABLE:
+                inbandQuery += INBAND_FROM_TABLE[getIdentifiedDBMS()]
 
         inbandQuery = self.suffixQuery(inbandQuery, comment, suffix)
 
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -12,6 +12,7 @@
 import subprocess
 import sys
 
+from lib.core.enums import DBMS
 from lib.core.revision import getRevisionNumber
 
 # sqlmap version and site
@@ -119,6 +120,8 @@
 SUPPORTED_DBMS      = MSSQL_ALIASES + MYSQL_ALIASES + PGSQL_ALIASES + ORACLE_ALIASES + SQLITE_ALIASES + ACCESS_ALIASES + FIREBIRD_ALIASES + MAXDB_ALIASES + SYBASE_ALIASES
 SUPPORTED_OS        = ( "linux", "windows" )
 
+INBAND_FROM_TABLE   = {DBMS.ORACLE: " FROM DUAL", DBMS.ACCESS: " FROM MSysObjects", DBMS.FIREBIRD: " FROM RDB$DATABASE", DBMS.MAXDB: " FROM VERSIONS"}
+
 SQL_STATEMENTS      = {
                        "SQL SELECT statement":  (
                              "select ",
diff --git a/lib/techniques/inband/union/test.py b/lib/techniques/inband/union/test.py
@@ -22,6 +22,7 @@
 from lib.core.data import queries
 from lib.core.enums import DBMS
 from lib.core.enums import PAYLOAD
+from lib.core.settings import INBAND_FROM_TABLE
 from lib.core.unescaper import unescaper
 from lib.parse.html import htmlParser
 from lib.request.connect import Connect as Request
@@ -97,14 +98,14 @@ def __unionTestByCharBruteforce(comment, place, parameter, value, prefix, suffix
     query = agent.prefixQuery("UNION ALL SELECT %s" % conf.uChar)
 
     for count in range(conf.uColsStart, conf.uColsStop+1):
-        if getIdentifiedDBMS() == DBMS.ORACLE and query.endswith(" FROM DUAL"):
-            query = query[:-len(" FROM DUAL")]
+        if getIdentifiedDBMS() in INBAND_FROM_TABLE and query.endswith(INBAND_FROM_TABLE[getIdentifiedDBMS()]):
+            query = query[:-len(INBAND_FROM_TABLE[getIdentifiedDBMS()])]
 
         if count:
             query += ", %s" % conf.uChar
 
-        if getIdentifiedDBMS() == DBMS.ORACLE:
-            query += " FROM DUAL"
+        if getIdentifiedDBMS() in INBAND_FROM_TABLE:
+            query += INBAND_FROM_TABLE[getIdentifiedDBMS()]
 
         status = '%d/%d (%d%s)' % (count, conf.uColsStop, round(100.0*count/conf.uColsStop), '%')
         debugMsg = "testing number of columns: %s" % status
diff --git a/lib/techniques/inband/union/use.py b/lib/techniques/inband/union/use.py
@@ -25,6 +25,7 @@
 from lib.core.enums import DBMS
 from lib.core.enums import PAYLOAD
 from lib.core.exception import sqlmapSyntaxException
+from lib.core.settings import INBAND_FROM_TABLE
 from lib.core.unescaper import unescaper
 from lib.request.connect import Connect as Request
 from lib.utils.resume import resume
@@ -118,7 +119,7 @@ def unionUse(expression, direct=False, unescape=True, resetCounter=False, unpack
                         stopLimit = conf.limitStop
 
                 if not stopLimit or stopLimit <= 1:
-                    if getIdentifiedDBMS() == DBMS.ORACLE and expression.endswith("FROM DUAL"):
+                    if getIdentifiedDBMS() in INBAND_FROM_TABLE and expression.endswith(INBAND_FROM_TABLE[getIdentifiedDBMS()]):
                         test = False
                     else:
                         test = True
