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

Minor update for an Issue #288

Browse Source
This commit is contained in:
Miroslav Stampar 2012-12-07 12:14:33 +01:00
parent 75e6d77fbc
commit fccad15cfa
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/request/redirecthandler.py
View File

@ -18,6 +18,7 @@ from lib.core.enums import CUSTOM_LOGGING
from lib.core.enums import HTTPHEADER
from lib.core.enums import REDIRECTION
from lib.core.exception import SqlmapConnectionException
from lib.core.settings import MAX_CONNECTION_CHUNK_SIZE
from lib.core.settings import MAX_SINGLE_URL_REDIRECTIONS
from lib.core.settings import MAX_TOTAL_REDIRECTIONS
from lib.core.threads import getCurrentThreadData
@ -75,6 +76,13 @@ class SmartRedirectHandler(urllib2.HTTPRedirectHandler):
content = None
redurl = self._get_header_redirect(headers)
try:
content = fp.read()
except Exception, msg:
dbgMsg = "there was a problem while retrieving "
dbgMsg += "redirect response content (%s)" % msg
logger.debug(dbgMsg)
threadData = getCurrentThreadData()
redirectMsg = "HTTP redirect "
redirectMsg += "[#%d] (%d %s):\n" % (threadData.lastRequestUID, code, getUnicode(msg))
@ -84,7 +92,9 @@ class SmartRedirectHandler(urllib2.HTTPRedirectHandler):
else:
logHeaders = ""
redirectMsg += getUnicode(logHeaders)
redirectMsg += "%s\n" % logHeaders
if content:
redirectMsg += "\n%s" % content[:MAX_CONNECTION_CHUNK_SIZE]
logger.log(CUSTOM_LOGGING.TRAFFIC_IN, redirectMsg)
@ -95,13 +105,6 @@ class SmartRedirectHandler(urllib2.HTTPRedirectHandler):
self._infinite_loop_check(req)
self._ask_redirect_choice(code, redurl)
try:
content = fp.read()
except Exception, msg:
dbgMsg = "there was a problem while retrieving "
dbgMsg += "redirect response content (%s)" % msg
logger.debug(dbgMsg)
if redurl and kb.redirectChoice == REDIRECTION.YES:
req.headers[HTTPHEADER.HOST] = getHostHeader(redurl)
result = urllib2.HTTPRedirectHandler.http_error_302(self, req, fp, code, msg, headers)