Proper reference to Metasploit Framework as now it's version 4, not 3 anymore

lib/core/option.py

@@ -608,13 +608,13 @@ def __setMetasploit():
                 break
 
         if condition:
-            debugMsg = "provided Metasploit Framework 3 path "
+            debugMsg = "provided Metasploit Framework path "
             debugMsg += "'%s' is valid" % conf.msfPath
             logger.debug(debugMsg)
 
             msfEnvPathExists = True
         else:
-            warnMsg = "the provided Metasploit Framework 3 path "
+            warnMsg = "the provided Metasploit Framework path "
             warnMsg += "'%s' is not valid. The cause could " % conf.msfPath
             warnMsg += "be that the path does not exists or that one "
             warnMsg += "or more of the needed Metasploit executables "
@@ -623,11 +623,11 @@ def __setMetasploit():
             logger.warn(warnMsg)
     else:
         warnMsg = "you did not provide the local path where Metasploit "
-        warnMsg += "Framework 3 is installed"
+        warnMsg += "Framework is installed"
         logger.warn(warnMsg)
 
     if not msfEnvPathExists:
-        warnMsg = "sqlmap is going to look for Metasploit Framework 3 "
+        warnMsg = "sqlmap is going to look for Metasploit Framework "
         warnMsg += "installation into the environment paths"
         logger.warn(warnMsg)
 
@@ -647,7 +647,7 @@ def __setMetasploit():
             condition &= os.path.exists(normalizePath(os.path.join(envPath, "msfpayload")))
 
             if condition:
-                infoMsg = "Metasploit Framework 3 has been found "
+                infoMsg = "Metasploit Framework has been found "
                 infoMsg += "installed in the '%s' path" % envPath
                 logger.info(infoMsg)
 
@@ -657,7 +657,7 @@ def __setMetasploit():
                 break
 
     if not msfEnvPathExists:
-        errMsg = "unable to locate Metasploit Framework 3 installation. "
+        errMsg = "unable to locate Metasploit Framework installation. "
         errMsg += "Get it from http://metasploit.com/framework/download/"
         raise sqlmapFilePathException, errMsg
 

lib/parse/cmdline.py

@@ -421,7 +421,7 @@ def cmdLineParser():
                             help="Database process' user privilege escalation")
 
         takeover.add_option("--msf-path", dest="msfPath",
-                            help="Local path where Metasploit Framework 3 "
+                            help="Local path where Metasploit Framework "
                                  "is installed")
 
         takeover.add_option("--tmp-path", dest="tmpPath",

lib/takeover/metasploit.py

@@ -368,7 +368,7 @@ class Metasploit:
     def __runMsfCliSmbrelay(self):
         self.__forgeMsfCliCmdForSmbrelay()
 
-        infoMsg = "running Metasploit Framework 3 command line "
+        infoMsg = "running Metasploit Framework command line "
         infoMsg += "interface locally, please wait.."
         logger.info(infoMsg)
 
@@ -378,7 +378,7 @@ class Metasploit:
     def __runMsfCli(self, exitfunc):
         self.__forgeMsfCliCmd(exitfunc)
 
-        infoMsg = "running Metasploit Framework 3 command line "
+        infoMsg = "running Metasploit Framework command line "
         infoMsg += "interface locally, please wait.."
         logger.info(infoMsg)
 
@@ -386,14 +386,14 @@ class Metasploit:
         self.__msfCliProc = execute(self.__cliCmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE)
 
     def __runMsfShellcodeRemote(self):
-        infoMsg = "running Metasploit Framework 3 shellcode "
+        infoMsg = "running Metasploit Framework shellcode "
         infoMsg += "remotely via UDF 'sys_bineval', please wait.."
         logger.info(infoMsg)
 
         self.udfExecCmd("'%s'" % self.shellcodeString, silent=True, udfName="sys_bineval")
 
     def __runMsfShellcodeRemoteViaSexec(self):
-        infoMsg = "running Metasploit Framework 3 shellcode remotely "
+        infoMsg = "running Metasploit Framework shellcode remotely "
         infoMsg += "via shellcodeexec, please wait.."
         logger.info(infoMsg)
 
@@ -495,7 +495,7 @@ class Metasploit:
                 return returncode
 
     def createMsfShellcode(self, exitfunc, format, extra, encode):
-        infoMsg = "creating Metasploit Framework 3 multi-stage shellcode "
+        infoMsg = "creating Metasploit Framework multi-stage shellcode "
         logger.info(infoMsg)
 
         self.__randStr = randomStr(lowercase=True)
@@ -574,7 +574,7 @@ class Metasploit:
         if self.connectionStr.startswith("bind"):
             func()
 
-        debugMsg = "Metasploit Framework 3 command line interface exited "
+        debugMsg = "Metasploit Framework command line interface exited "
         debugMsg += "with return code %s" % self.__controlMsfCmd(self.__msfCliProc, func)
         logger.debug(debugMsg)
 
@@ -593,7 +593,7 @@ class Metasploit:
         else:
             self.uncPath = "\\\\%s\\%s" % (self.lhostStr, self.__randFile)
 
-        debugMsg = "Metasploit Framework 3 console exited with return "
+        debugMsg = "Metasploit Framework console exited with return "
         debugMsg += "code %s" % self.__controlMsfCmd(self.__msfCliProc, self.uncPathRequest)
         logger.debug(debugMsg)
 
@@ -603,6 +603,6 @@ class Metasploit:
         if self.connectionStr.startswith("bind"):
             self.spHeapOverflow()
 
-        debugMsg = "Metasploit Framework 3 command line interface exited "
+        debugMsg = "Metasploit Framework command line interface exited "
         debugMsg += "with return code %s" % self.__controlMsfCmd(self.__msfCliProc, self.spHeapOverflow)
         logger.debug(debugMsg)