Minor bug fix.

bdamele · bdamele · commit 4b622ed860f2 · 2009-07-06T14:40:33.000Z
Adapted Metasploit wrapping functions to work with latest msf3 development version too.
diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py
@@ -80,11 +80,11 @@ def __initVars(self):
 
         self.__msfPayloadsList    = {
                                       "windows": {
-                                                   1: ( "Reflective Meterpreter (default)", "windows/reflectivemeterpreter" ),
-                                                   2: ( "Meterpreter", "windows/meterpreter" ),
+                                                   1: ( "Reflective Meterpreter (default)", "windows/meterpreter" ),
+                                                   2: ( "PatchUp Meterpreter (only from Metasploit development revision 6742)", "windows/patchupmeterpreter" ),
                                                    3: ( "Shell", "windows/shell" ),
-                                                   4: ( "Reflective VNC", "windows/reflectivevncinject" ),
-                                                   5: ( "VNC", "windows/vncinject" ),
+                                                   4: ( "Reflective VNC", "windows/vncinject" ),
+                                                   5: ( "PatchUp VNC (only from Metasploit development revision 6742)", "windows/patchupvncinject" ),
                                                  },
                                       "linux":   {
                                                    1: ( "Shell", "linux/x86/shell" ),
@@ -150,7 +150,7 @@ def __skeletonSelection(self, msg, lst=None, maxValue=1, default=1):
                 if num > maxValue:
                     maxValue = num
 
-                if "default" in description:
+                if "(default)" in description:
                     default = num
 
                 message += "\n[%d] %s" % (num, description)
@@ -198,7 +198,7 @@ def __selectPayload(self, askChurrasco=True):
             infoMsg += "'incognito' extension to privilege escalate"
             logger.info(infoMsg)
 
-            __payloadStr = "windows/reflectivemeterpreter"
+            __payloadStr = "windows/meterpreter"
 
         else:
             __payloadStr = self.__skeletonSelection("payload", self.__msfPayloadsList)
@@ -239,7 +239,7 @@ def __selectPayload(self, askChurrasco=True):
                     choice = readInput(message, default="2")
 
                     if not choice or choice == "2":
-                        __payloadStr = "windows/reflectivemeterpreter"
+                        __payloadStr = "windows/meterpreter"
 
                         break
 
diff --git a/plugins/dbms/mssqlserver.py b/plugins/dbms/mssqlserver.py
@@ -541,7 +541,7 @@ def stackedWriteFile(self, wFile, dFile, fileType, confirm=True):
 
             for i in range(0, wFileSize, debugSize):
                 wFileChunk = wFileContent[i:i+debugSize]
-                chunkName  = self.updateBinChunk(wFileChunk, dFile, tmpPath)
+                chunkName  = self.updateBinChunk(wFileChunk, tmpPath)
 
                 if i == 0:
                     infoMsg = "renaming chunk "
