Drei patch (Issue #4235)

This commit is contained in:
Miroslav Stampar 2020-06-17 21:58:10 +02:00
parent 596fff48ad
commit d4d83b29f0
2 changed files with 4 additions and 4 deletions

View File

@ -18,7 +18,7 @@ from lib.core.enums import OS
from thirdparty.six import unichr as _unichr from thirdparty.six import unichr as _unichr
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.4.6.11" VERSION = "1.4.6.12"
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} 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) VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

View File

@ -71,10 +71,10 @@ class MultipartPostHandler(_urllib.request.BaseHandler):
# NOTE: https://github.com/sqlmapproject/sqlmap/issues/4235 # NOTE: https://github.com/sqlmapproject/sqlmap/issues/4235
if request.data: if request.data:
for match in re.finditer(r"(?i)\s*-{20,}\w+(\s+Content-Disposition[^\n]+\s+|\-\-\s*)", request.data): for match in re.finditer(b"(?i)\s*-{20,}\w+(\s+Content-Disposition[^\n]+\s+|\-\-\s*)", request.data):
part = match.group(0) part = match.group(0)
if '\r' not in part: if b'\r' not in part:
request.data = request.data.replace(part, part.replace("\n", "\r\n")) request.data = request.data.replace(part, part.replace(b'\n', b"\r\n"))
return request return request