sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-03-03 19:55:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor update

Browse Source
This commit is contained in:
Miroslav Stampar 2019-03-28 22:45:44 +01:00
parent f82f1f912d
commit f8eed1f365
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/core/convert.py
View File

@ -27,7 +27,7 @@ def base64decode(value):
'foobar' 'foobar'
""" """
return base64.b64decode(value) return base64.b64decode(unicodeencode(value))
def base64encode(value): def base64encode(value):
""" """
@ -37,7 +37,7 @@ def base64encode(value):
'Zm9vYmFy' 'Zm9vYmFy'
""" """
return base64.b64encode(value) return base64.b64encode(unicodeencode(value))
def base64pickle(value): def base64pickle(value):
""" """
@ -89,7 +89,14 @@ def hexdecode(value):
""" """
value = value.lower() value = value.lower()
return (value[2:] if value.startswith("0x") else value).decode("hex") value = value[2:] if value.startswith("0x") else value
if six.PY2:
retVal = value.decode("hex")
else:
retVal = bytes.fromhex(value)
return retVal
def hexencode(value, encoding=None): def hexencode(value, encoding=None):
""" """
@ -99,7 +106,14 @@ def hexencode(value, encoding=None):
'666f6f626172' '666f6f626172'
""" """
return unicodeencode(value, encoding).encode("hex") retVal = unicodeencode(value, encoding)
if six.PY2:
retVal = retVal.encode("hex")
else:
retVal = retVal.hex()
return retVal
def unicodeencode(value, encoding=None): def unicodeencode(value, encoding=None):
""" """
@ -110,11 +124,13 @@ def unicodeencode(value, encoding=None):
""" """
retVal = value retVal = value
if isinstance(value, unicode):
if isinstance(value, six.text_type):
try: try:
retVal = value.encode(encoding or UNICODE_ENCODING) retVal = value.encode(encoding or UNICODE_ENCODING)
except UnicodeEncodeError: except UnicodeEncodeError:
retVal = value.encode(UNICODE_ENCODING, "replace") retVal = value.encode(encoding or UNICODE_ENCODING, "replace")
return retVal return retVal
def utf8encode(value): def utf8encode(value):
@ -164,13 +180,11 @@ def stdoutencode(data):
retVal = None retVal = None
try: try:
data = data or "" retVal = unicodeencode(data or "", sys.stdout.encoding)
# Reference: http://bugs.python.org/issue1602 # Reference: http://bugs.python.org/issue1602
if IS_WIN: if IS_WIN:
output = data.encode(sys.stdout.encoding, "replace") if '?' in retVal and '?' not in retVal:
if '?' in output and '?' not in data:
warnMsg = "cannot properly display Unicode characters " warnMsg = "cannot properly display Unicode characters "
warnMsg += "inside Windows OS command prompt " warnMsg += "inside Windows OS command prompt "
warnMsg += "(http://bugs.python.org/issue1602). All " warnMsg += "(http://bugs.python.org/issue1602). All "
@ -180,11 +194,8 @@ def stdoutencode(data):
warnMsg += "corresponding output files. " warnMsg += "corresponding output files. "
singleTimeWarnMessage(warnMsg) singleTimeWarnMessage(warnMsg)
retVal = output
else:
retVal = data.encode(sys.stdout.encoding)
except: except:
retVal = data.encode(UNICODE_ENCODING) if isinstance(data, unicode) else data retVal = unicodeencode(data or "")
return retVal return retVal

2
lib/core/settings.py
View File

@ -17,7 +17,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
from lib.core.enums import OS from lib.core.enums import OS
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.3.3.74" VERSION = "1.3.3.75"
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)