code cleanup

bdamele · bdamele · commit 4e909a2a0541 · 2014-07-01T00:58:49.000+01:00
diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py
@@ -519,7 +519,7 @@ def _controlMsfCmd(self, proc, func):
                 timeout = time.time() - start_time > METASPLOIT_SESSION_TIMEOUT
 
                 if not initialized:
-                    match = re.search("session ([\d]+) opened", out)
+                    match = re.search("Meterpreter session ([\d]+) opened", out)
 
                     if match:
                         self._loadMetExtensions(proc, match.group(1))
diff --git a/plugins/dbms/mssqlserver/filesystem.py b/plugins/dbms/mssqlserver/filesystem.py
@@ -196,6 +196,7 @@ def _stackedWriteFilePS(self, tmpPath, wFileContent, dFile, fileType):
         logger.debug("executing the PowerShell base64-decoding script to write the %s file, please wait.." % dFile)
 
         commands = ("powershell -ExecutionPolicy ByPass -File \"%s\"" % randPSScriptPath,
+                    "del /F /Q \"%s\"" % encodedBase64FilePath,
                     "del /F /Q \"%s\"" % randPSScriptPath)
         complComm = " & ".join(command for command in commands)
 
