CERBERUS/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2026-08-04 14:55:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes version comparison

Browse source
This commit is contained in:
Miroslav Štampar 2026-07-19 13:37:42 +02:00
parent d08e992ad6
commit 932a5bd7b2
3 changed files with 66 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

47
lib/core/common.py
View file

@ -190,7 +190,6 @@ from lib.core.settings import URI_QUESTION_MARKER
from lib.core.settings import URLENCODE_CHAR_LIMIT
from lib.core.settings import URLENCODE_FAILSAFE_CHARS
from lib.core.settings import USER_AGENT_ALIASES
from lib.core.settings import VERSION_COMPARISON_CORRECTION
from lib.core.settings import VERSION_STRING
from lib.core.settings import ZIP_HEADER
from lib.core.settings import WEBSCARAB_SPLITTER
@ -3500,42 +3499,40 @@ def isDBMSVersionAtLeast(minimum):
if not any(isNoneValue(_) for _ in (Backend.getVersion(), minimum)) and Backend.getVersion() != UNKNOWN_DBMS_VERSION:
version = Backend.getVersion().replace(" ", "").rstrip('.')
correction = 0.0
# Note: a fuzzy/ranged detected version (e.g. '>2', '<2') is captured as a sign so an
# otherwise-equal comparison still resolves in the right direction
vSign = 0
if ">=" in version:
pass
elif '>' in version:
correction = VERSION_COMPARISON_CORRECTION
vSign = 1
elif '<' in version:
correction = -VERSION_COMPARISON_CORRECTION
vSign = -1
version = extractRegexResult(r"(?P<result>[0-9][0-9.]*)", version)
if version:
if '.' in version:
parts = version.split('.', 1)
parts[1] = filterStringValue(parts[1], '[0-9]')
version = '.'.join(parts)
minimum = minimum if isinstance(minimum, six.string_types) else getUnicode(minimum)
try:
version = float(filterStringValue(version, '[0-9.]')) + correction
except ValueError:
return None
mSign = 0
if minimum.startswith(">="):
pass
elif minimum.startswith(">"):
mSign = 1
if isinstance(minimum, six.string_types):
if '.' in minimum:
parts = minimum.split('.', 1)
parts[1] = filterStringValue(parts[1], '[0-9]')
minimum = '.'.join(parts)
minimum = extractRegexResult(r"(?P<result>[0-9][0-9.]*)", minimum)
correction = 0.0
if minimum.startswith(">="):
pass
elif minimum.startswith(">"):
correction = VERSION_COMPARISON_CORRECTION
if minimum:
# Note: compare dotted versions component-wise as int tuples, not as floats; a float
# collapses e.g. 5.4.3->5.43 and 5.10.0->5.100(==5.1), silently mis-ordering multi-part
# or multi-digit-minor versions (MariaDB 10.11, PostgreSQL 9.10, Presto 0.99 vs 0.178)
vParts = tuple(int(_) for _ in re.findall(r"\d+", version))
mParts = tuple(int(_) for _ in re.findall(r"\d+", minimum))
length = max(len(vParts), len(mParts))
vParts += (0,) * (length - len(vParts))
mParts += (0,) * (length - len(mParts))
minimum = float(filterStringValue(minimum, '[0-9.]')) + correction
retVal = version >= minimum
retVal = (vParts, vSign) >= (mParts, mSign)
return retVal

2
lib/core/settings.py
View file

@ -20,7 +20,7 @@ from lib.core.enums import OS
from thirdparty import six
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.10.7.126"
VERSION = "1.10.7.127"
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)