Minor bug fix.

Adapted Metasploit wrapping functions to work with latest msf3 development version too.
This commit is contained in:
Bernardo Damele 2009-07-06 14:40:33 +00:00
parent 0fc4587f02
commit 4b622ed860
2 changed files with 8 additions and 8 deletions

View File

@ -80,11 +80,11 @@ class Metasploit:
self.__msfPayloadsList = { self.__msfPayloadsList = {
"windows": { "windows": {
1: ( "Reflective Meterpreter (default)", "windows/reflectivemeterpreter" ), 1: ( "Reflective Meterpreter (default)", "windows/meterpreter" ),
2: ( "Meterpreter", "windows/meterpreter" ), 2: ( "PatchUp Meterpreter (only from Metasploit development revision 6742)", "windows/patchupmeterpreter" ),
3: ( "Shell", "windows/shell" ), 3: ( "Shell", "windows/shell" ),
4: ( "Reflective VNC", "windows/reflectivevncinject" ), 4: ( "Reflective VNC", "windows/vncinject" ),
5: ( "VNC", "windows/vncinject" ), 5: ( "PatchUp VNC (only from Metasploit development revision 6742)", "windows/patchupvncinject" ),
}, },
"linux": { "linux": {
1: ( "Shell", "linux/x86/shell" ), 1: ( "Shell", "linux/x86/shell" ),
@ -150,7 +150,7 @@ class Metasploit:
if num > maxValue: if num > maxValue:
maxValue = num maxValue = num
if "default" in description: if "(default)" in description:
default = num default = num
message += "\n[%d] %s" % (num, description) message += "\n[%d] %s" % (num, description)
@ -198,7 +198,7 @@ class Metasploit:
infoMsg += "'incognito' extension to privilege escalate" infoMsg += "'incognito' extension to privilege escalate"
logger.info(infoMsg) logger.info(infoMsg)
__payloadStr = "windows/reflectivemeterpreter" __payloadStr = "windows/meterpreter"
else: else:
__payloadStr = self.__skeletonSelection("payload", self.__msfPayloadsList) __payloadStr = self.__skeletonSelection("payload", self.__msfPayloadsList)
@ -239,7 +239,7 @@ class Metasploit:
choice = readInput(message, default="2") choice = readInput(message, default="2")
if not choice or choice == "2": if not choice or choice == "2":
__payloadStr = "windows/reflectivemeterpreter" __payloadStr = "windows/meterpreter"
break break

View File

@ -541,7 +541,7 @@ class MSSQLServerMap(Fingerprint, Enumeration, Filesystem, Miscellaneous, Takeov
for i in range(0, wFileSize, debugSize): for i in range(0, wFileSize, debugSize):
wFileChunk = wFileContent[i:i+debugSize] wFileChunk = wFileContent[i:i+debugSize]
chunkName = self.updateBinChunk(wFileChunk, dFile, tmpPath) chunkName = self.updateBinChunk(wFileChunk, tmpPath)
if i == 0: if i == 0:
infoMsg = "renaming chunk " infoMsg = "renaming chunk "