Merge branch 'master' of github.com:sqlmapproject/sqlmap

stamparm · stamparm · commit 0a4f5d2e5134 · 2013-01-19T19:08:18.000+01:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -622,17 +622,40 @@ def getDocRoot():
         warnMsg = "unable to retrieve the web server document root"
         logger.warn(warnMsg)
 
-        message = "please provide the web server document root "
-        message += "[%s]: " % ",".join(root for root in defaultDocRoot)
-        inputDocRoot = readInput(message, default=defaultDocRoot)
+        docRoot = []
 
-        if inputDocRoot:
-            if isinstance(inputDocRoot, basestring):
-                docRoot = inputDocRoot.split(',')
+        message = "do you want to provide a text file with a list of "
+        message += "directories to try? [y/N] "
+        answer = readInput(message, default="N")
+
+        if answer and answer.lower() == "y":
+            message = "please provide the directories list file to try: "
+            dirFilePath = readInput(message)
+
+            if dirFilePath:
+                if os.path.isfile(dirFilePath):
+                    fd = codecs.open(dirFilePath, "rb", UNICODE_ENCODING)
+
+                    for filepath in fd.readlines():
+                        docRoot.append(normalizePath(filepath))
+
+                else:
+                    errMsg = "provided directory list file %s " % dirFilePath
+                    errMsg += "is not a valid file"
+                    logger.error(errMsg)
+
+        if len(docRoot) == 0:
+            message = "please provide the web server document root "
+            message += "[%s]: " % ", ".join(root for root in defaultDocRoot)
+            inputDocRoot = readInput(message, default=defaultDocRoot)
+
+            if inputDocRoot:
+                if isinstance(inputDocRoot, basestring):
+                    docRoot = inputDocRoot.split(',')
+                else:
+                    docRoot = inputDocRoot
             else:
-                docRoot = inputDocRoot
-        else:
-            docRoot = defaultDocRoot
+                docRoot = defaultDocRoot
 
     return docRoot
 
@@ -657,8 +680,9 @@ def getDirs():
     if webDir:
         directories.add(webDir)
 
-    message = "please provide any additional web server full path to try "
-    message += "to upload the agent [Enter for None]: "
+    message = "please provide additional comma separated file paths to "
+    message += "try to upload the agent inside the possible document "
+    message += "root%s [Enter for None]: " % "s" if len(kb.docRoot) > 1 else ""
     inputDirs = readInput(message)
 
     if inputDirs:
@@ -1325,8 +1349,9 @@ def normalizePath(filepath):
 
     retVal = filepath
 
-    if filepath:
-        retVal = ntpath.normpath(filepath) if isWindowsDriveLetterPath(filepath) else posixpath.normpath(filepath)
+    if retVal:
+        retVal = retVal.strip("\r").strip("\n")
+        retVal = ntpath.normpath(retVal) if isWindowsDriveLetterPath(retVal) else posixpath.normpath(retVal)
 
     return retVal
 
diff --git a/lib/takeover/web.py b/lib/takeover/web.py
@@ -191,7 +191,7 @@ def webInit(self):
                 self.webApi = choices[int(choice) - 1]
                 break
 
-        kb.docRoot = getDocRoot()
+        kb.docRoot = arrayizeValue(getDocRoot())
         directories = sorted(getDirs())
 
         backdoorName = "tmpb%s.%s" % (randomStr(lowercase=True), self.webApi)
@@ -202,7 +202,7 @@ def webInit(self):
 
         success = False
 
-        for docRoot in arrayizeValue(kb.docRoot):
+        for docRoot in kb.docRoot:
             if success:
                 break
 
diff --git a/plugins/dbms/mysql/filesystem.py b/plugins/dbms/mysql/filesystem.py
@@ -100,8 +100,6 @@ def unionWriteFile(self, wFile, dFile, fileType):
         sqlQuery = "%s INTO DUMPFILE '%s'" % (fcEncodedStr, dFile)
         unionUse(sqlQuery, unpack=False)
 
-        self.askCheckWrittenFile(wFile, dFile)
-
         warnMsg = "expect junk characters inside the "
         warnMsg += "file as a leftover from UNION query"
         singleTimeWarnMessage(warnMsg)
