diff --git a/extra/vulnserver/vulnserver.py b/extra/vulnserver/vulnserver.py index b348a1c93..0666edc48 100644 --- a/extra/vulnserver/vulnserver.py +++ b/extra/vulnserver/vulnserver.py @@ -1227,7 +1227,8 @@ class ReqHandler(BaseHTTPRequestHandler): params.update(dict((_[0], _[1].replace("'", "'").replace(""", '"').replace("<", '<').replace(">", '>').replace("&", '&')) for _ in re.findall(r'name="([^"]+)" value="([^"]*)"', self.data))) else: self.data = self.data.replace(';', '&') # Note: seems that Python3 started ignoring parameter splitting with ';' - params.update(parse_qs(self.data)) + # Note: parsing the raw (i.e. not yet URL decoded) body, otherwise encoded '&'/'=' inside values would split them + params.update(parse_qs((getattr(self, "rawData", None) or self.data).replace(';', '&'))) for name in self.headers: params[name.lower()] = self.headers[name] @@ -1748,7 +1749,8 @@ class ReqHandler(BaseHTTPRequestHandler): length = int(self.headers.get("Content-length", 0)) if length: data = self.rfile.read(length) - data = unquote_plus(data.decode(UNICODE_ENCODING, "ignore")) + self.rawData = data.decode(UNICODE_ENCODING, "ignore") + data = unquote_plus(self.rawData) self.data = data elif self.headers.get("Transfer-encoding") == "chunked": data, line = b"", b"" diff --git a/lib/core/settings.py b/lib/core/settings.py index dad3e3bd2..d53e6fb14 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import OS from thirdparty import six # sqlmap version (...) -VERSION = "1.10.11.85" +VERSION = "1.10.11.86" 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)