sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-02-03 05:04:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

another fix for Bug #148

Browse Source
This commit is contained in:
Miroslav Stampar 2010-01-23 23:29:34 +00:00
parent 39652bfbf4
commit 98205cc488
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/core/common.py
View File

@ -32,6 +32,7 @@ import time
import urlparse
import ntpath
import posixpath
from lib.contrib import magic
from lib.core.data import conf
from lib.core.data import kb
@ -869,3 +870,7 @@ def safeStringFormat(formatStr, params):
count += 1
return retVal
def sanitizeAsciiString(string):
return "".join(char if ord(char) <= 128 else '?' for char in string)

13
lib/request/connect.py
View File

@ -29,13 +29,13 @@ import time
import urllib2
import urlparse
import traceback
import unicodedata
from lib.contrib import multipartpost
from lib.core.convert import urlencode
from lib.core.data import conf
from lib.core.data import kb
from lib.core.data import logger
from lib.core.common import sanitizeAsciiString
from lib.core.exception import sqlmapConnectionException
from lib.request.basic import decodePage
from lib.request.basic import forgeHeaders
@ -75,7 +75,7 @@ class Connect:
cookieStr = ""
requestMsg = "HTTP request:\n%s " % conf.method
requestMsg += "%s" % urlparse.urlsplit(url)[2] or "/"
responseMsg = u"HTTP response "
responseMsg = "HTTP response "
requestHeaders = ""
responseHeaders = ""
@ -92,7 +92,7 @@ class Connect:
elif multipart:
multipartOpener = urllib2.build_opener(multipartpost.MultipartPostHandler)
conn = multipartOpener.open(url, multipart)
page = conn.read()
page = conn.read()
responseHeaders = conn.info()
encoding = responseHeaders.get("Content-Encoding")
@ -159,7 +159,7 @@ class Connect:
code = conn.code
status = conn.msg
responseHeaders = conn.info()
encoding = responseHeaders.get("Content-Encoding")
page = decodePage(page, encoding)
@ -221,15 +221,16 @@ class Connect:
socket.setdefaulttimeout(conf.timeout)
page = sanitizeAsciiString(page)
parseResponse(page, responseHeaders)
responseMsg += "(%s - %d):\n" % (status, code)
if conf.verbose <= 4:
responseMsg += str(responseHeaders)
elif conf.verbose > 4:
responseMsg += "%s\n%s\n" % (responseHeaders, page)
responseMsg = unicodedata.normalize('NFKD', responseMsg).encode('ascii','ignore')
logger.log(8, responseMsg)
return page, responseHeaders