bug fix for 404 program termination during shell upload attempt

stamparm · stamparm · commit 7c88e32f9d96 · 2010-02-03T16:16:34.000Z
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -70,6 +70,7 @@ def getPage(**kwargs):
         direct    = kwargs.get('direct',    False)
         multipart = kwargs.get('multipart', False)
         silent    = kwargs.get('silent',    False)
+        raise404  = kwargs.get('raise404',  True)
 
         page            = ""
         cookieStr       = ""
@@ -168,7 +169,7 @@ def getPage(**kwargs):
                 exceptionMsg  = "not authorized, try to provide right HTTP "
                 exceptionMsg += "authentication type and valid credentials"
                 raise sqlmapConnectionException, exceptionMsg
-            elif e.code == 404:
+            elif e.code == 404 and raise404:
                 exceptionMsg = "page not found"
                 raise sqlmapConnectionException, exceptionMsg
             else:
diff --git a/lib/takeover/web.py b/lib/takeover/web.py
@@ -181,7 +181,7 @@ def webInit(self):
             self.webBaseUrl     = "%s://%s:%d%s" % (conf.scheme, conf.hostname, conf.port, requestDir)
             self.webUploaderUrl = "%s/%s" % (self.webBaseUrl, uploaderName)
             self.webUploaderUrl = self.webUploaderUrl.replace("./", "/").replace("\\", "/")
-            uplPage, _  = Request.getPage(url=self.webUploaderUrl, direct=True)
+            uplPage, _  = Request.getPage(url=self.webUploaderUrl, direct=True, raise404=False)
 
             if "sqlmap file uploader" not in uplPage:
                 warnMsg  = "unable to upload the uploader "
