Couple of minor patches

This commit is contained in:
Miroslav Stampar 2019-05-16 01:41:26 +02:00
parent 5bc9e2a631
commit 094cfee30d
3 changed files with 6 additions and 4 deletions

View File

@ -4551,6 +4551,8 @@ def decodeDbmsHexValue(value, raw=False):
True True
>>> decodeDbmsHexValue(['0x31', '0x32']) == [u'1', u'2'] >>> decodeDbmsHexValue(['0x31', '0x32']) == [u'1', u'2']
True True
>>> decodeDbmsHexValue('5.1.41') == u'5.1.41'
True
""" """
retVal = value retVal = value
@ -4559,7 +4561,7 @@ def decodeDbmsHexValue(value, raw=False):
retVal = value retVal = value
if value and isinstance(value, six.string_types): if value and isinstance(value, six.string_types):
if len(value) % 2 != 0: if len(value) % 2 != 0:
retVal = b"%s?" % decodeHex(value[:-1]) if len(value) > 1 else value retVal = (decodeHex(value[:-1]) + b'?') if len(value) > 1 else value
singleTimeWarnMessage("there was a problem decoding value '%s' from expected hexadecimal form" % value) singleTimeWarnMessage("there was a problem decoding value '%s' from expected hexadecimal form" % value)
else: else:
retVal = decodeHex(value) retVal = decodeHex(value)

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.3.5.95" VERSION = "1.3.5.96"
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

@ -154,9 +154,9 @@ class Response:
stream = io.BytesIO(raw) stream = io.BytesIO(raw)
first_line = stream.readline() first_line = stream.readline()
parts = cls.extract_status.search(first_line) parts = cls.extract_status.search(first_line)
status_line = b"HTTP/1.0 %s %s" % (parts.group(1), parts.group(2)) status_line = "HTTP/1.0 %s %s" % (getText(parts.group(1)), getText(parts.group(2)))
remain = stream.read() remain = stream.read()
altered = status_line + b"\r\n" + remain altered = getBytes(status_line) + b"\r\n" + remain
comment = first_line comment = first_line
response = _http_client.HTTPResponse(FakeSocket(altered)) response = _http_client.HTTPResponse(FakeSocket(altered))