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

Minor patch for ws

Browse Source
This commit is contained in:
Miroslav Stampar
2021-02-08 11:18:27 +01:00
parent cd77cdd1e8
commit 01e83cb4a0
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/core/common.py
View File

@@ -2882,33 +2882,31 @@ def urldecode(value, encoding=None, unsafe="%%?&=;+%s" % CUSTOM_INJECTION_MARK_C
True
>>> urldecode('AND%201%3E%282%2B3%29%23', convall=False) == 'AND 1>(2%2B3)#'
True
>>> urldecode(b'AND%201%3E%282%2B3%29%23', convall=False) == 'AND 1>(2%2B3)#'
True
"""
result = value
if value:
try:
# for cases like T%C3%BCrk%C3%A7e
value = str(value)
except ValueError:
pass
finally:
if convall:
result = _urllib.parse.unquote_plus(value) if spaceplus else _urllib.parse.unquote(value)
else:
result = value
charset = set(string.printable) - set(unsafe)
value = getUnicode(value)
def _(match):
char = decodeHex(match.group(1), binary=False)
return char if char in charset else match.group(0)
if convall:
result = _urllib.parse.unquote_plus(value) if spaceplus else _urllib.parse.unquote(value)
else:
result = value
charset = set(string.printable) - set(unsafe)
if spaceplus:
result = result.replace('+', ' ') # plus sign has a special meaning in URL encoded data (hence the usage of _urllib.parse.unquote_plus in convall case)
def _(match):
char = decodeHex(match.group(1), binary=False)
return char if char in charset else match.group(0)
result = re.sub(r"%([0-9a-fA-F]{2})", _, result)
if spaceplus:
result = result.replace('+', ' ') # plus sign has a special meaning in URL encoded data (hence the usage of _urllib.parse.unquote_plus in convall case)
result = getUnicode(result, encoding or UNICODE_ENCODING)
result = re.sub(r"%([0-9a-fA-F]{2})", _, result)
result = getUnicode(result, encoding or UNICODE_ENCODING)
return result