code cleanup

This commit is contained in:
Bernardo Damele 2014-07-01 00:58:49 +01:00
parent b38bd1e7fd
commit 4e909a2a05
2 changed files with 2 additions and 1 deletions

View File

@ -519,7 +519,7 @@ class Metasploit:
timeout = time.time() - start_time > METASPLOIT_SESSION_TIMEOUT timeout = time.time() - start_time > METASPLOIT_SESSION_TIMEOUT
if not initialized: if not initialized:
match = re.search("session ([\d]+) opened", out) match = re.search("Meterpreter session ([\d]+) opened", out)
if match: if match:
self._loadMetExtensions(proc, match.group(1)) self._loadMetExtensions(proc, match.group(1))

View File

@ -196,6 +196,7 @@ class Filesystem(GenericFilesystem):
logger.debug("executing the PowerShell base64-decoding script to write the %s file, please wait.." % dFile) logger.debug("executing the PowerShell base64-decoding script to write the %s file, please wait.." % dFile)
commands = ("powershell -ExecutionPolicy ByPass -File \"%s\"" % randPSScriptPath, commands = ("powershell -ExecutionPolicy ByPass -File \"%s\"" % randPSScriptPath,
"del /F /Q \"%s\"" % encodedBase64FilePath,
"del /F /Q \"%s\"" % randPSScriptPath) "del /F /Q \"%s\"" % randPSScriptPath)
complComm = " & ".join(command for command in commands) complComm = " & ".join(command for command in commands)