Patch for an Issue #288

stamparm · stamparm · commit fbaeecdaf941 · 2012-12-07T11:52:21.000+01:00
diff --git a/lib/request/redirecthandler.py b/lib/request/redirecthandler.py
@@ -14,6 +14,7 @@
 from lib.core.common import getUnicode
 from lib.core.common import logHTTPTraffic
 from lib.core.common import readInput
+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
@@ -60,7 +61,7 @@ def _process_http_redirect(self, result, headers, code, content, msg, redurl):
 
         responseMsg += getUnicode(logHeaders)
 
-        logger.log(7, responseMsg)
+        logger.log(CUSTOM_LOGGING.TRAFFIC_IN, responseMsg)
 
         if "set-cookie" in headers:
             kb.redirectSetCookie = headers["set-cookie"].split("; path")[0]
@@ -74,7 +75,18 @@ def http_error_302(self, req, fp, code, msg, headers):
         content = None
         redurl = self._get_header_redirect(headers)
 
-        kb.httpErrorCodes[code] = kb.httpErrorCodes.get(code, 0) + 1
+        threadData = getCurrentThreadData()
+        redirectMsg = "HTTP redirect "
+        redirectMsg += "[#%d] (%d %s):\n" % (threadData.lastRequestUID, code, getUnicode(msg))
+
+        if headers:
+            logHeaders = "\n".join("%s: %s" % (key.capitalize() if isinstance(key, basestring) else key, getUnicode(value)) for (key, value) in headers.items())
+        else:
+            logHeaders = ""
+
+        redirectMsg += getUnicode(logHeaders)
+
+        logger.log(CUSTOM_LOGGING.TRAFFIC_IN, redirectMsg)
 
         if redurl:
             if not urlparse.urlsplit(redurl).netloc:
