sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-23 01:56:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor fix (when redirected path has non-ASCII char and conf.url is unicode) and bits along with pieces

Browse Source
This commit is contained in:
Miroslav Stampar 2012-05-14 14:06:43 +00:00
parent 595f69fa2c
commit 333f8057a5
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/core/common.py
View File

@ -1886,7 +1886,10 @@ def getUnicode(value, encoding=None, system=False, noneToNull=False):
if isinstance(value, unicode): if isinstance(value, unicode):
return value return value
elif isinstance(value, basestring): elif isinstance(value, basestring):
return unicode(value, encoding or UNICODE_ENCODING, errors="replace") try:
return unicode(value, encoding or kb.pageEncoding)
except:
return unicode(value, UNICODE_ENCODING, "replace")
else: else:
return unicode(value) # encoding ignored for non-basestring instances return unicode(value) # encoding ignored for non-basestring instances
else: else:
@ -2511,7 +2514,7 @@ def openFile(filename, mode='r'):
""" """
try: try:
return codecs.open(filename, mode, UNICODE_ENCODING, errors="replace") return codecs.open(filename, mode, UNICODE_ENCODING, "replace")
except IOError: except IOError:
errMsg = "there has been a file opening error for filename '%s'. " % filename errMsg = "there has been a file opening error for filename '%s'. " % filename
errMsg += "Please check %s permissions on a file " % ("write" if \ errMsg += "Please check %s permissions on a file " % ("write" if \

2
lib/core/convert.py
View File

@ -77,7 +77,7 @@ def urldecode(value, encoding=None):
result = urllib.unquote_plus(value) result = urllib.unquote_plus(value)
if isinstance(result, str): if isinstance(result, str):
result = unicode(result, encoding or UNICODE_ENCODING, errors="replace") result = unicode(result, encoding or UNICODE_ENCODING, "replace")
return result return result

2
lib/request/redirecthandler.py
View File

@ -78,7 +78,7 @@ class SmartRedirectHandler(urllib2.HTTPRedirectHandler):
redurl = self._get_header_redirect(headers) redurl = self._get_header_redirect(headers)
if not urlparse.urlsplit(redurl).netloc: if not urlparse.urlsplit(redurl).netloc:
redurl = urlparse.urljoin(conf.url, redurl) redurl = urlparse.urljoin(req.get_full_url(), redurl)
self._infinite_loop_check(req) self._infinite_loop_check(req)
self._ask_redirect_choice(code, redurl) self._ask_redirect_choice(code, redurl)