From 74552bea87d5a8dee2a5d7431b9ab4418e62669b Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 7 Jan 2013 16:51:00 +0100 Subject: [PATCH] Cleaning some garbage (hard coded paths with linux native slashes) --- lib/core/common.py | 1 - lib/takeover/metasploit.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index dc8a2ca51..873821b0e 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -919,7 +919,6 @@ def setPaths(): paths.SQLMAP_OUTPUT_PATH = os.path.join(paths.SQLMAP_ROOT_PATH, "output") paths.SQLMAP_DUMP_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "dump") paths.SQLMAP_FILES_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "files") - paths.SQLMAP_SEXEC_PATH = os.path.join(paths.SQLMAP_EXTRAS_PATH, "shellcodeexec") # sqlmap files paths.SQLMAP_HISTORY = os.path.join(paths.SQLMAP_ROOT_PATH, ".sqlmap_history") diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py index da78210fb..eae01bad0 100644 --- a/lib/takeover/metasploit.py +++ b/lib/takeover/metasploit.py @@ -534,12 +534,12 @@ class Metasploit: os.unlink(self._shellcodeFilePath) def uploadShellcodeexec(self, web=False): - self.shellcodeexecLocal = paths.SQLMAP_SEXEC_PATH + self.shellcodeexecLocal = os.path.join(paths.SQLMAP_EXTRAS_PATH, "shellcodeexec") if Backend.isOs(OS.WINDOWS): - self.shellcodeexecLocal += "/windows/shellcodeexec.x%s.exe" % "32" + self.shellcodeexecLocal = os.path.join(self.shellcodeexecLocal, "windows", "shellcodeexec.x%s.exe" % "32") else: - self.shellcodeexecLocal += "/linux/shellcodeexec.x%s" % Backend.getArch() + self.shellcodeexecLocal = os.path.join(self.shellcodeexecLocal, "linux", "shellcodeexec.x%s" % Backend.getArch()) __basename = "tmpse%s%s" % (self._randStr, ".exe" if Backend.isOs(OS.WINDOWS) else "")