Fixes #4549

stamparm · stamparm · commit f3e8039145e8 · 2021-01-19T12:25:03.000+01:00
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -18,7 +18,7 @@
 from thirdparty.six import unichr as _unichr
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.5.1.35"
+VERSION = "1.5.1.36"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
diff --git a/plugins/generic/misc.py b/plugins/generic/misc.py
@@ -25,7 +25,6 @@
 from lib.core.enums import HASHDB_KEYS
 from lib.core.enums import OS
 from lib.core.exception import SqlmapNoneDataException
-from lib.core.exception import SqlmapUnsupportedFeatureException
 from lib.request import inject
 
 class Miscellaneous(object):
@@ -83,25 +82,16 @@ def getVersionFromBanner(self):
         infoMsg = "detecting back-end DBMS version from its banner"
         logger.info(infoMsg)
 
-        if Backend.isDbms(DBMS.MYSQL):
-            first, last = 1, 6
-
-        elif Backend.isDbms(DBMS.PGSQL):
-            first, last = 12, 6
-
-        elif Backend.isDbms(DBMS.MSSQL):
-            first, last = 29, 9
-
-        else:
-            raise SqlmapUnsupportedFeatureException("unsupported DBMS")
-
-        query = queries[Backend.getIdentifiedDbms()].substring.query % (queries[Backend.getIdentifiedDbms()].banner.query, first, last)
+        query = queries[Backend.getIdentifiedDbms()].banner.query
 
         if conf.direct:
             query = "SELECT %s" % query
 
-        kb.bannerFp["dbmsVersion"] = unArrayizeValue(inject.getValue(query))
-        kb.bannerFp["dbmsVersion"] = (kb.bannerFp["dbmsVersion"] or "").replace(',', "").replace('-', "").replace(' ', "")
+        kb.bannerFp["dbmsVersion"] = unArrayizeValue(inject.getValue(query)) or ""
+
+        match = re.search(r"\d[\d.-]*", kb.bannerFp["dbmsVersion"])
+        if match:
+            kb.bannerFp["dbmsVersion"] = match.group(0)
 
     def delRemoteFile(self, filename):
         if not filename:
