Some cleaning up for #3283

plugins/dbms/h2/connector.py

@@ -5,87 +5,14 @@ Copyright (c) 2006-2018 sqlmap developers (http://sqlmap.org/)
 See the file 'LICENSE' for copying permission
 """
 
-try:
-    import jaydebeapi
-    import jpype
-except:
-    pass
-
-import logging
-
-from lib.core.common import checkFile
-from lib.core.common import readInput
-from lib.core.data import conf
-from lib.core.data import logger
-from lib.core.exception import SqlmapConnectionException
+from lib.core.exception import SqlmapUnsupportedFeatureException
 from plugins.generic.connector import Connector as GenericConnector
 
 class Connector(GenericConnector):
-    """
-    Homepage: https://pypi.python.org/pypi/JayDeBeApi/ & http://jpype.sourceforge.net/
-    User guide: https://pypi.python.org/pypi/JayDeBeApi/#usage & http://jpype.sourceforge.net/doc/user-guide/userguide.html
-    API: -
-    Debian package: -
-    License: LGPL & Apache License 2.0
-    """
-
     def __init__(self):
         GenericConnector.__init__(self)
 
     def connect(self):
-        self.initConnection()
-        try:
-            msg = "what's the location of 'hsqldb.jar'? "
-            jar = readInput(msg)
-            checkFile(jar)
-            args = "-Djava.class.path=%s" % jar
-            jvm_path = jpype.getDefaultJVMPath()
-            jpype.startJVM(jvm_path, args)
-        except Exception, msg:
-            raise SqlmapConnectionException(msg[0])
-
-        try:
-            driver = 'org.hsqldb.jdbc.JDBCDriver'
-            connection_string = 'jdbc:hsqldb:mem:.'  # 'jdbc:hsqldb:hsql://%s/%s' % (self.hostname, self.db)
-            self.connector = jaydebeapi.connect(driver, connection_string, str(self.user), str(self.password))
-        except Exception, msg:
-            raise SqlmapConnectionException(msg[0])
-
-        self.initCursor()
-        self.printConnected()
-
-    def fetchall(self):
-        try:
-            return self.cursor.fetchall()
-        except Exception, msg:
-            logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg[1])
-            return None
-
-    def execute(self, query):
-        retVal = False
-
-        try:
-            self.cursor.execute(query)
-            retVal = True
-        except Exception, msg:  # TODO: fix with specific error
-            logger.log(logging.WARN if conf.dbmsHandler else logging.DEBUG, "(remote) %s" % msg[1])
-
-        self.connector.commit()
-
-        return retVal
-
-    def select(self, query):
-        retVal = None
-
-        upper_query = query.upper()
-
-        if query and not (upper_query.startswith("SELECT ") or upper_query.startswith("VALUES ")):
-            query = "VALUES %s" % query
-
-        if query and upper_query.startswith("SELECT ") and " FROM " not in upper_query:
-            query = "%s FROM (VALUES(0))" % query
-
-        self.cursor.execute(query)
-        retVal = self.cursor.fetchall()
-
-        return retVal
+        errMsg = "on H2 it is not (currently) possible to establish a "
+        errMsg += "direct connection"
+        raise SqlmapUnsupportedFeatureException(errMsg)

plugins/dbms/h2/enumeration.py

@@ -12,6 +12,7 @@ from lib.core.data import logger
 from lib.core.data import queries
 from lib.core.common import unArrayizeValue
 from lib.core.enums import DBMS
+from lib.core.settings import H2_DEFAULT_SCHEMA
 from lib.request import inject
 
 class Enumeration(GenericEnumeration):
@@ -40,3 +41,12 @@ class Enumeration(GenericEnumeration):
     def getHostname(self):
         warnMsg = "on H2 it is not possible to enumerate the hostname"
         logger.warn(warnMsg)
+
+    def getCurrentDb(self):
+        return H2_DEFAULT_SCHEMA
+
+    def getPasswordHashes(self):
+        warnMsg = "on H2 it is not possible to list password hashes"
+        logger.warn(warnMsg)
+
+        return {}

plugins/dbms/h2/fingerprint.py

@@ -27,32 +27,28 @@ class Fingerprint(GenericFingerprint):
         value = ""
         wsOsFp = Format.getOs("web server", kb.headersFp)
 
-        if wsOsFp and not conf.api:
+        if wsOsFp:
             value += "%s\n" % wsOsFp
 
         if kb.data.banner:
             dbmsOsFp = Format.getOs("back-end DBMS", kb.bannerFp)
 
-            if dbmsOsFp and not conf.api:
+            if dbmsOsFp:
                 value += "%s\n" % dbmsOsFp
 
         value += "back-end DBMS: "
-        actVer = Format.getDbms()
 
         if not conf.extensiveFp:
-            value += actVer
+            value += DBMS.H2
             return value
 
+        actVer = Format.getDbms()
         blank = " " * 15
         value += "active fingerprint: %s" % actVer
 
         if kb.bannerFp:
             banVer = kb.bannerFp.get("dbmsVersion")
-
-            if re.search(r"-log$", kb.data.banner):
-                banVer += ", logging enabled"
-
-            banVer = Format.getDbms([banVer] if banVer else None)
+            banVer = Format.getDbms([banVer])
             value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
 
         htmlErrorFp = Format.getErrorParsedDBMSes()
@@ -66,9 +62,6 @@ class Fingerprint(GenericFingerprint):
         if not conf.extensiveFp and Backend.isDbmsWithin(H2_ALIASES):
             setDbms("%s %s" % (DBMS.H2, Backend.getVersion()))
 
-            if Backend.isVersionGreaterOrEqualThan("1.7.2"):
-                kb.data.has_information_schema = True
-
             self.getBanner()
 
             return True
@@ -90,31 +83,15 @@ class Fingerprint(GenericFingerprint):
 
                 return False
             else:
-                kb.data.has_information_schema = True
-                Backend.setVersion(">= 1.7.2")
-                setDbms("%s 1.7.2" % DBMS.H2)
+                setDbms(DBMS.H2)
 
-                banner = self.getBanner()
-                if banner:
-                    Backend.setVersion("= %s" % banner)
-                else:
-                    if inject.checkBooleanExpression("(SELECT [RANDNUM] FROM (VALUES(0)))=[RANDNUM]"):
-                        Backend.setVersionList([">= 2.0.0", "< 2.3.0"])
-                    else:
-                        banner = unArrayizeValue(inject.getValue("\"org.hsqldbdb.Library.getDatabaseFullProductVersion\"()", safeCharEncode=True))
-                        if banner:
-                            Backend.setVersion("= %s" % banner)
-                        else:
-                            Backend.setVersionList([">= 1.7.2", "< 1.8.0"])
+                self.getBanner()
 
-            return True
+                return True
         else:
             warnMsg = "the back-end DBMS is not %s" % DBMS.H2
             logger.warn(warnMsg)
 
-            dbgMsg = "...or version is < 1.7.2"
-            logger.debug(dbgMsg)
-
             return False
 
     def getHostname(self):

plugins/dbms/maxdb/connector.py

@@ -13,6 +13,6 @@ class Connector(GenericConnector):
         GenericConnector.__init__(self)
 
     def connect(self):
-        errMsg = "on SAP MaxDB it is not possible to establish a "
+        errMsg = "on SAP MaxDB it is not (currently) possible to establish a "
         errMsg += "direct connection"
         raise SqlmapUnsupportedFeatureException(errMsg)