PenTest/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-12-06 20:51:31 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #3781

Browse Source
This commit is contained in:
Miroslav Stampar
2019-06-27 01:48:35 +02:00
parent 580dc2a4e2
commit c938d77be9
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/core/common.py
View File

@@ -3129,6 +3129,9 @@ def isDBMSVersionAtLeast(minimum):
False
>>> isDBMSVersionAtLeast("1.5")
True
>>> kb.dbmsVersion = "MySQL 5.4.3-log4"
>>> isDBMSVersionAtLeast("5")
True
>>> kb.dbmsVersion = popValue()
"""
@@ -3137,11 +3140,6 @@ def isDBMSVersionAtLeast(minimum):
if not any(isNoneValue(_) for _ in (Backend.getVersion(), minimum)) and Backend.getVersion() != UNKNOWN_DBMS_VERSION:
version = Backend.getVersion().replace(" ", "").rstrip('.')
if '.' in version:
parts = version.split('.', 1)
parts[1] = filterStringValue(parts[1], '[0-9]')
version = '.'.join(parts)
correction = 0.0
if ">=" in version:
pass
@@ -3150,23 +3148,31 @@ def isDBMSVersionAtLeast(minimum):
elif '<' in version:
correction = -VERSION_COMPARISON_CORRECTION
version = float(filterStringValue(version, '[0-9.]')) + correction
version = extractRegexResult(r"(?P<result>[0-9][0-9.]*)", version)
if isinstance(minimum, six.string_types):
if '.' in minimum:
parts = minimum.split('.', 1)
if version:
if '.' in version:
parts = version.split('.', 1)
parts[1] = filterStringValue(parts[1], '[0-9]')
minimum = '.'.join(parts)
version = '.'.join(parts)
correction = 0.0
if minimum.startswith(">="):
pass
elif minimum.startswith(">"):
correction = VERSION_COMPARISON_CORRECTION
version = float(filterStringValue(version, '[0-9.]')) + correction
minimum = float(filterStringValue(minimum, '[0-9.]')) + correction
if isinstance(minimum, six.string_types):
if '.' in minimum:
parts = minimum.split('.', 1)
parts[1] = filterStringValue(parts[1], '[0-9]')
minimum = '.'.join(parts)
retVal = version >= minimum
correction = 0.0
if minimum.startswith(">="):
pass
elif minimum.startswith(">"):
correction = VERSION_COMPARISON_CORRECTION
minimum = float(filterStringValue(minimum, '[0-9.]')) + correction
retVal = version >= minimum
return retVal