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

bdamele · bdamele · commit f890b29f812b · 2011-09-12T17:26:22.000Z
diff --git a/doc/FAQ.pdf b/doc/FAQ.pdf
diff --git a/doc/README.html b/doc/README.html
diff --git a/doc/README.pdf b/doc/README.pdf
diff --git a/doc/README.sgml b/doc/README.sgml
@@ -101,7 +101,7 @@ Assume that:
 
 <tscreen><tt>http://192.168.136.131/sqlmap/mysql/get_int.php?id=1+AND+1=1</tt></tscreen>
 
-is the same page as the original one and (the condition evaluates to <bf>True<bf>):
+is the same page as the original one and (the condition evaluates to <bf>True</bf>):
 
 <tscreen><tt>http://192.168.136.131/sqlmap/mysql/get_int.php?id=1+AND+1=2</tt></tscreen>
 
@@ -923,7 +923,7 @@ Options:
     --os-smbrelay       One click prompt for an OOB shell, meterpreter or VNC
     --os-bof            Stored procedure buffer overflow exploitation
     --priv-esc          Database process' user privilege escalation
-    --msf-path=MSFPATH  Local path where Metasploit Framework 3 is installed
+    --msf-path=MSFPATH  Local path where Metasploit Framework is installed
     --tmp-path=TMPPATH  Remote absolute path of temporary files directory
 
   Windows registry access:
@@ -2854,7 +2854,7 @@ operating system?
 [1] Via UDF 'sys_bineval' (in-memory way, anti-forensics, default)
 [2] Stand-alone payload stager (file system way)
 > 
-[hh:mm:35] [INFO] creating Metasploit Framework 3 multi-stage shellcode 
+[hh:mm:35] [INFO] creating Metasploit Framework multi-stage shellcode 
 which connection type do you want to use?
 [1] Reverse TCP: Connect back from the database host to this machine (default)
 [2] Reverse TCP: Try to connect back from the database host to this machine, on all ports 
@@ -2869,7 +2869,7 @@ which payload do you want to use?
 [3] VNC
 > 
 [hh:mm:40] [INFO] creation in progress ... done
-[hh:mm:43] [INFO] running Metasploit Framework 3 command line interface locally, please wait..
+[hh:mm:43] [INFO] running Metasploit Framework command line interface locally, please wait..
 
                                   _
                                  | |      o
@@ -2891,7 +2891,7 @@ LPORT => 60641
 LHOST => 192.168.136.1
 [*] Started reverse handler on 192.168.136.1:60641 
 [*] Starting the payload handler...
-[hh:mm:48] [INFO] running Metasploit Framework 3 shellcode remotely via UDF 'sys_bineval', 
+[hh:mm:48] [INFO] running Metasploit Framework shellcode remotely via UDF 'sys_bineval', 
 please wait..
 [*] Sending stage (749056 bytes) to 192.168.136.129
 [*] Meterpreter session 1 opened (192.168.136.1:60641 -> 192.168.136.129:1689) at Mon Apr 11 
diff --git a/doc/THANKS b/doc/THANKS
@@ -504,7 +504,7 @@ Kazim Bugra Tombul <mhackmail@gmail.com>
     for reporting a minor bug
 
 Efrain Torres <et@metasploit.com>
-    for helping me out to improve the Metasploit Framework 3 sqlmap
+    for helping me out to improve the Metasploit Framework sqlmap
     auxiliary module and for commiting it on the Metasploit official
     subversion repository
     for his great Metasploit WMAP Framework
@@ -694,7 +694,7 @@ AthCon Conference team <cfp@athcon.org>
     Slides: http://goo.gl/QMfjO
 
 Metasploit Framework development team <msfdev@metasploit.com>
-    for their powerful tool Metasploit Framework 3, used by sqlmap, among
+    for their powerful tool Metasploit Framework, used by sqlmap, among
     others things, to create the shellcode and establish an out-of-band
     connection between sqlmap and the database server
     Homepage: http://www.metasploit.com
diff --git a/lib/core/option.py b/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
 
diff --git a/lib/parse/cmdline.py b/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",
diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py
@@ -368,7 +368,7 @@ def __forgeMsfPayloadCmd(self, exitfunc, format, outFile, extra=None):
     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,22 +378,22 @@ def __runMsfCliSmbrelay(self):
     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)
 
         logger.debug("executing local command: %s" % self.__cliCmd)
         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 @@ def __controlMsfCmd(self, proc, func):
                 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 @@ def pwn(self, goUdf=False):
         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 @@ def smb(self):
         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 @@ def bof(self):
         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)
diff --git a/sqlmap.conf b/sqlmap.conf
@@ -471,7 +471,7 @@ osBof = False
 # payload to be Meterpreter.
 privEsc = False
 
-# Local path where Metasploit Framework 3 is installed.
+# Local path where Metasploit Framework is installed.
 # Valid: file system path
 msfPath = 
 
diff --git a/tamper/unmagicquotes.py b/tamper/unmagicquotes.py
@@ -22,7 +22,8 @@ def dependencies():
 
 def tamper(payload):
     """
-    Replaces quote character (') with a multi-byte combo %bf%27 together with generic comment at the end (to make it work)
+    Replaces quote character (') with a multi-byte combo %bf%27 together with
+    generic comment at the end (to make it work)
 
     Example:
         * Input: 1' AND 1=1
