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

minor fix regarding last couple of commits

Browse Source
This commit is contained in:
Miroslav Stampar 2011-03-17 11:25:37 +00:00
parent 970cde5a8a
commit 9a513198dd
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/request/redirecthandler.py
View File

@ -9,6 +9,7 @@ See the file 'doc/COPYING' for copying permission
import urllib2 import urllib2
from lib.core.data import logger
from lib.core.exception import sqlmapConnectionException from lib.core.exception import sqlmapConnectionException
from lib.core.threads import getCurrentThreadData from lib.core.threads import getCurrentThreadData
@ -21,9 +22,9 @@ class SmartRedirectHandler(urllib2.HTTPRedirectHandler):
# assuming we're in a loop # assuming we're in a loop
max_redirections = 10 max_redirections = 10
def common_http_redirect(self, result, headers, code, msg): def common_http_redirect(self, result, headers, code, content):
threadData = getCurrentThreadData() threadData = getCurrentThreadData()
threadData.lastRedirectMsg = (threadData.lastRequestUID, msg) threadData.lastRedirectMsg = (threadData.lastRequestUID, content)
if "location" in headers: if "location" in headers:
result.redurl = headers.getheaders("location")[0].split("?")[0] result.redurl = headers.getheaders("location")[0].split("?")[0]
@ -39,13 +40,31 @@ class SmartRedirectHandler(urllib2.HTTPRedirectHandler):
def http_error_301(self, req, fp, code, msg, headers): def http_error_301(self, req, fp, code, msg, headers):
self.infinite_loop_check(req) self.infinite_loop_check(req)
content = None
try:
content = fp.read()
except Exception, msg:
dbgMsg = "there was a problem while retrieving "
dbgMsg += "redirect response content (%s)" % msg
logger.debug(dbgMsg)
result = urllib2.HTTPRedirectHandler.http_error_301(self, req, fp, code, msg, headers) result = urllib2.HTTPRedirectHandler.http_error_301(self, req, fp, code, msg, headers)
return self.common_http_redirect(result, headers, code, msg) return self.common_http_redirect(result, headers, code, content)
def http_error_302(self, req, fp, code, msg, headers): def http_error_302(self, req, fp, code, msg, headers):
self.infinite_loop_check(req) self.infinite_loop_check(req)
content = None
try:
content = fp.read()
except Exception, msg:
dbgMsg = "there was a problem while retrieving "
dbgMsg += "redirect response content (%s)" % msg
logger.debug(dbgMsg)
result = urllib2.HTTPRedirectHandler.http_error_302(self, req, fp, code, msg, headers) result = urllib2.HTTPRedirectHandler.http_error_302(self, req, fp, code, msg, headers)
return self.common_http_redirect(result, headers, code, msg) return self.common_http_redirect(result, headers, code, content)
def infinite_loop_check(self, req): def infinite_loop_check(self, req):
if hasattr(req, 'redirect_dict') and (req.redirect_dict.get(req.get_full_url(), 0) >= self.max_repeats or len(req.redirect_dict) >= self.max_redirections): if hasattr(req, 'redirect_dict') and (req.redirect_dict.get(req.get_full_url(), 0) >= self.max_repeats or len(req.redirect_dict) >= self.max_redirections):