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

fix for a charset euc_tw reported by devon.mitchell1988@y​ahoo.com

Browse Source
This commit is contained in:
Miroslav Stampar 2011-05-16 19:26:58 +00:00
parent 6ba9dea640
commit ba1df457ab
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/request/basic.py
View File

@ -97,7 +97,7 @@ def checkCharEncoding(encoding):
return encoding return encoding
# http://www.destructor.de/charsets/index.htm # http://www.destructor.de/charsets/index.htm
translate = { 'windows-874': 'iso-8859-11', 'en_us': 'utf8', 'macintosh': 'iso-8859-1' } translate = { 'windows-874': 'iso-8859-11', 'en_us': 'utf8', 'macintosh': 'iso-8859-1', 'euc_tw': 'big5_tw' }
for delimiter in (';', ','): for delimiter in (';', ','):
if delimiter in encoding: if delimiter in encoding:
@ -110,12 +110,16 @@ def checkCharEncoding(encoding):
encoding = encoding.replace('5889', '8859') # iso-5889 -> iso-8859 encoding = encoding.replace('5889', '8859') # iso-5889 -> iso-8859
elif '2313' in encoding: elif '2313' in encoding:
encoding = encoding.replace('2313', '2312') # gb2313 -> gb2312 encoding = encoding.replace('2313', '2312') # gb2313 -> gb2312
elif 'x-euc' in encoding:
encoding = encoding.replace('x-euc', 'euc') # x-euc-kr -> euc-kr
# name adjustment for compatibility # name adjustment for compatibility
if encoding.startswith('8859'): if encoding.startswith('8859'):
encoding = 'iso-%s' % encoding encoding = 'iso-%s' % encoding
elif encoding.startswith('cp-'): elif encoding.startswith('cp-'):
encoding = 'cp%s' % encoding[3:] encoding = 'cp%s' % encoding[3:]
elif encoding.startswith('euc-'):
encoding = 'euc_%s' % encoding[4:]
elif encoding.startswith('windows') and not encoding.startswith('windows-'): elif encoding.startswith('windows') and not encoding.startswith('windows-'):
encoding = 'windows-%s' % encoding[7:] encoding = 'windows-%s' % encoding[7:]
elif encoding.find('iso-88') > 0: elif encoding.find('iso-88') > 0:
@ -185,7 +189,7 @@ def decodePage(page, contentEncoding, contentType):
if contentType and any(map(lambda x: x in contentType.lower(), ('text/txt', 'text/raw', 'text/html', 'text/xml'))): if contentType and any(map(lambda x: x in contentType.lower(), ('text/txt', 'text/raw', 'text/html', 'text/xml'))):
# can't do for all responses because we need to support binary files too # can't do for all responses because we need to support binary files too
kb.pageEncoding = kb.pageEncoding or getHeuristicCharEncoding(page) kb.pageEncoding = kb.pageEncoding or checkCharEncoding(getHeuristicCharEncoding(page))
page = getUnicode(page, kb.pageEncoding) page = getUnicode(page, kb.pageEncoding)
return page return page