sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-25 19:13:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

better update related to the last commit

Browse Source
This commit is contained in:
Miroslav Stampar 2011-03-24 20:04:20 +00:00
parent c0cc5d1dad
commit 1f1c4c0e61
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/core/common.py
View File

@ -22,6 +22,7 @@ import ntpath
import posixpath import posixpath
import httplib import httplib
import struct import struct
import unicodedata
from ConfigParser import DEFAULTSECT from ConfigParser import DEFAULTSECT
from ConfigParser import RawConfigParser from ConfigParser import RawConfigParser
@ -2431,3 +2432,13 @@ def removeReflectiveValues(content, payload):
logger.debug(debugMsg) logger.debug(debugMsg)
return retVal return retVal
def normalizeUnicode(value):
"""
Does an ASCII normalization of unicode strings
Reference: http://www.peterbe.com/plog/unicode-to-ascii
"""
retVal = value
if isinstance(value, unicode):
retVal = unicodedata.normalize('NFKD', value).encode('ascii','ignore')
return retVal

5
lib/core/dump.py
View File

@ -15,6 +15,7 @@ from lib.core.common import Backend
from lib.core.common import dataToDumpFile from lib.core.common import dataToDumpFile
from lib.core.common import dataToStdout from lib.core.common import dataToStdout
from lib.core.common import getUnicode from lib.core.common import getUnicode
from lib.core.common import normalizeUnicode
from lib.core.common import openFile from lib.core.common import openFile
from lib.core.common import restoreDumpMarkedChars from lib.core.common import restoreDumpMarkedChars
from lib.core.data import conf from lib.core.data import conf
@ -159,7 +160,7 @@ class Dump:
if isinstance(table, (list, tuple, set)): if isinstance(table, (list, tuple, set)):
table = table[0] table = table[0]
maxlength = max(maxlength, len(getUnicode(table))) maxlength = max(maxlength, len(normalizeUnicode(table)))
lines = "-" * (int(maxlength) + 2) lines = "-" * (int(maxlength) + 2)
@ -179,7 +180,7 @@ class Dump:
if isinstance(table, (list, tuple, set)): if isinstance(table, (list, tuple, set)):
table = table[0] table = table[0]
blank = " " * (maxlength - len(getUnicode(table))) blank = " " * (maxlength - len(normalizeUnicode(table)))
self.__write("| %s%s |" % (table, blank)) self.__write("| %s%s |" % (table, blank))
self.__write("+%s+\n" % lines) self.__write("+%s+\n" % lines)