This commit is contained in:
Miroslav Stampar 2019-05-16 12:35:45 +02:00
parent 0a67f0f57c
commit e90846b8c1
2 changed files with 11 additions and 2 deletions

View File

@ -3900,9 +3900,18 @@ def normalizeUnicode(value):
>>> normalizeUnicode(u'\u0161u\u0107uraj') == u'sucuraj' >>> normalizeUnicode(u'\u0161u\u0107uraj') == u'sucuraj'
True True
>>> normalizeUnicode(getUnicode(codecs.decode("666f6f00626172", "hex"))) == u'foobar'
True
""" """
return getUnicode(unicodedata.normalize("NFKD", value).encode("ascii", "ignore")) if isinstance(value, six.text_type) else value retVal = value
if isinstance(value, six.text_type):
charset = string.printable[:string.printable.find(' ') + 1]
retVal = unicodedata.normalize("NFKD", value)
retVal = "".join(_ for _ in retVal if _ in charset)
return retVal
def safeSQLIdentificatorNaming(name, isTable=False): def safeSQLIdentificatorNaming(name, isTable=False):
""" """

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.97" VERSION = "1.3.5.98"
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)