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

Fixing CI/CD errors

Browse source
This commit is contained in:
Miroslav Štampar 2026-07-29 17:40:02 +02:00
parent 311bf7ce4d
commit 3186a4fa31
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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.248"
VERSION = "1.10.7.249"
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)

20
lib/techniques/xxe/inject.py
View file

@ -485,11 +485,15 @@ def _confirmRead(page, pattern, baseline):
return None
def _normalizeEscaping(text):
"""Bounded, non-resolving decode of the common reflection encodings (HTML entities, percent-
encoding, JS \\uXXXX / escaped slash) so an ESCAPED entity reference (&amp;e;, &#38;e;, &#x26;e;,
%26e%3B, \\u0026e;) is unmasked and can be recognised as reflection rather than file content."""
def _reflectsEntity(text, ent):
"""True if the random entity NAME surfaces at ANY bounded de-escaping depth (raw included) - i.e.
the parser echoed the reference in some encoding (&amp;e;, &#38;e;, &#x26;e;, %26e%3B, \\u0026e;)
rather than expanding the external entity, so it is reflection, not file content. Checked at every
step because a further round of htmlUnescape can consume an entity-name prefix that is itself a
valid HTML entity (e.g. 'lt...'/'gt...'/'amp...'), which would otherwise mask the reflection."""
out = getUnicode(text)
if ent in out:
return True
for _ in range(3): # a few rounds catch double-encoding; capped
prev = out
try:
@ -501,9 +505,11 @@ def _normalizeEscaping(text):
except Exception:
pass
out = out.replace("\\u0026", "&").replace("\\u003b", ";").replace("\\/", "/")
if ent in out:
return True
if out == prev:
break
return out
return False
def _readBetweenMarkers(xml, rootName, systemId, isB64, m1, m2):
@ -521,14 +527,14 @@ def _readBetweenMarkers(xml, rootName, systemId, isB64, m1, m2):
data = match.group(1)
# a reflected (not expanded) entity in ANY encoding: the random entity NAME survives de-escaping ->
# the parser echoed the reference, it did not resolve the external entity -> not file content
if not data.strip() or ent in _normalizeEscaping(data):
if not data.strip() or _reflectsEntity(data, ent):
return None, payload
if isB64:
try:
data = getText(decodeBase64(data.strip())) # strict base64 also validates real bytes
except Exception:
return None, payload
if not data or not data.strip() or ent in _normalizeEscaping(data):
if not data or not data.strip() or _reflectsEntity(data, ent):
return None, payload
return (data if (data and data.strip()) else None), payload