Display HTTP request in -v>=3 even if connection failed

bdamele · bdamele · commit fea241475972 · 2010-06-10T14:42:17.000Z
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -106,7 +106,6 @@ def getPage(**kwargs):
                 conn = multipartOpener.open(url, multipart)
                 page = conn.read()
                 responseHeaders = conn.info()
-
                 page = decodePage(page, responseHeaders.get("Content-Encoding"), responseHeaders.get("Content-Type"))
 
                 return page
@@ -119,45 +118,21 @@ def getPage(**kwargs):
                     get = urlencode(get)
                     url = "%s?%s" % (url, get)
                     requestMsg += "?%s" % get
-    
+
                 if conf.method == "POST":
                     if conf.parameters.has_key("POST") and not post:
                         post = conf.parameters["POST"]
 
             requestMsg += " HTTP/1.1"
 
             # Perform HTTP request
-            headers        = forgeHeaders(cookie, ua)
-            req            = urllib2.Request(url, post, headers)
-            conn           = urllib2.urlopen(req)
-
-            if hasattr(conn, "redurl") and hasattr(conn, "redcode") and not conf.redirectHandled:
-                msg  = "sqlmap got a %d redirect to " % conn.redcode
-                msg += "%s - What target address do you " % conn.redurl
-                msg += "want to use from now on? %s " % conf.url
-                msg += "(default) or provide another target address based "
-                msg += "also on the redirection got from the application\n"
-
-                while True:
-                    choice = readInput(msg, default="1")
-
-                    if not choice or choice == "1":
-                        pass
-                    else:
-                        conf.url = choice
-                        return Connect.__getPageProxy(**kwargs)
-
-                    break
-
-                conf.redirectHandled = True
-
-            # Reset the number of connection retries
-            conf.retriesCount = 0
+            headers = forgeHeaders(cookie, ua)
+            req = urllib2.Request(url, post, headers)
 
             if not req.has_header("Accept-Encoding"):
-                requestHeaders += "\nAccept-Encoding: identity"
+                requestHeaders += "Accept-Encoding: identity\n"
 
-            requestHeaders = "\n".join(["%s: %s" % (header, value) for header, value in req.header_items()])
+            requestHeaders += "\n".join(["%s: %s" % (header, value) for header, value in req.header_items()])
 
             if not conf.dropSetCookie and conf.cj:
                 for _, cookie in enumerate(conf.cj):
@@ -171,7 +146,7 @@ def getPage(**kwargs):
 
             if not req.has_header("Cookie") and cookieStr:
                 requestHeaders += "\n%s" % cookieStr[:-2]
-     
+
             if not req.has_header("Connection"):
                 requestHeaders += "\nConnection: close"
 
@@ -184,12 +159,36 @@ def getPage(**kwargs):
 
             logger.log(9, requestMsg)
 
+            conn = urllib2.urlopen(req)
+
+            if hasattr(conn, "redurl") and hasattr(conn, "redcode") and not conf.redirectHandled:
+                msg  = "sqlmap got a %d redirect to " % conn.redcode
+                msg += "%s - What target address do you " % conn.redurl
+                msg += "want to use from now on? %s " % conf.url
+                msg += "(default) or provide another target address based "
+                msg += "also on the redirection got from the application\n"
+
+                while True:
+                    choice = readInput(msg, default="1")
+
+                    if not choice or choice == "1":
+                        pass
+                    else:
+                        conf.url = choice
+                        return Connect.__getPageProxy(**kwargs)
+
+                    break
+
+                conf.redirectHandled = True
+
+            # Reset the number of connection retries
+            conf.retriesCount = 0
+
             # Get HTTP response
-            page            = conn.read()
-            code            = conn.code
-            status          = conn.msg
+            page = conn.read()
+            code = conn.code
+            status = conn.msg
             responseHeaders = conn.info()
-
             page = decodePage(page, responseHeaders.get("Content-Encoding"), responseHeaders.get("Content-Type"))
 
         except urllib2.HTTPError, e:
