Land #2642 - Fix titles

modules/auxiliary/dos/cisco/ios_http_percentpercent.rb

@@ -14,7 +14,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Cisco IOS HTTP GET /%% request Denial of Service',
+      'Name'           => 'Cisco IOS HTTP GET /%% Request Denial of Service',
       'Description'    => %q{
         This module triggers a Denial of Service condition in the Cisco IOS
         HTTP server. By sending a GET request for "/%%", the device becomes

modules/auxiliary/dos/http/apache_range_dos.rb

@@ -15,7 +15,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Apache Range header DoS (Apache Killer)',
+      'Name'           => 'Apache Range Header DoS (Apache Killer)',
       'Description'    => %q{
           The byterange filter in the Apache HTTP Server 2.0.x through 2.0.64, and 2.2.x
         through 2.2.19 allows remote attackers to cause a denial of service (memory and

modules/auxiliary/dos/wireshark/chunked.rb

@@ -12,7 +12,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Wireshark chunked_encoding_dissector function DOS',
+      'Name'           => 'Wireshark chunked_encoding_dissector Function DOS',
       'Description'    => %q{
         Wireshark crash when dissecting an HTTP chunked response.
         Versions affected: 0.99.5 (Bug 1394)

modules/auxiliary/dos/wireshark/ldap.rb

@@ -12,7 +12,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize
     super(
-      'Name'        => 'Wireshark LDAP dissector DOS',
+      'Name'        => 'Wireshark LDAP Dissector DOS',
       'Description' => %q{
           The LDAP dissector in Wireshark 0.99.2 through 0.99.8 allows remote attackers
           to cause a denial of service (application crash) via a malformed packet.

modules/auxiliary/scanner/http/apache_activemq_source_disclosure.rb

@@ -13,7 +13,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Apache ActiveMQ JSP files Source Disclosure',
+      'Name'           => 'Apache ActiveMQ JSP Files Source Disclosure',
       'Description'    => %q{
           This module exploits a source code disclosure in Apache ActiveMQ. The
         vulnerability is due to the Jetty's ResourceHandler handling of specially crafted

modules/auxiliary/scanner/http/dell_idrac.rb

@@ -14,7 +14,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize
     super(
-      'Name' => 'Dell iDRAC default Login',
+      'Name' => 'Dell iDRAC Default Login',
       'Description' => %q{
         This module attempts to login to a iDRAC webserver instance using
         default username and password.  Tested against Dell Remote Access

modules/auxiliary/scanner/http/splunk_web_login.rb

@@ -14,7 +14,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize(info={})
     super(update_info(info,
-      'Name'           => 'Splunk Web interface Login Utility',
+      'Name'           => 'Splunk Web Interface Login Utility',
       'Description'    => %{
         This module simply attempts to login to a Splunk web interface.  Please note the
         free version of Splunk actually does not require any authentication, in that case

modules/auxiliary/scanner/msf/msf_web_login.rb

@@ -15,7 +15,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize
     super(
-      'Name'           => 'Metasploit Web interface Login Utility',
+      'Name'           => 'Metasploit Web Interface Login Utility',
       'Description'    => %{
         This module simply attempts to login to a Metasploit
         web interface using a specific user/pass.

modules/auxiliary/scanner/openvas/openvas_gsad_login.rb

@@ -15,7 +15,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize
     super(
-      'Name'        => 'OpenVAS gsad Web interface Login Utility',
+      'Name'        => 'OpenVAS gsad Web Interface Login Utility',
       'Description' => %q{
         This module simply attempts to login to a OpenVAS gsad interface
         using a specific user/pass.

modules/auxiliary/scanner/oracle/isqlplus_sidbrute.rb

@@ -14,7 +14,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize
     super(
-      'Name'        => 'Oracle isqlplus SID Check',
+      'Name'        => 'Oracle iSQLPlus SID Check',
       'Description' => %q{
         This module attempts to bruteforce the SID on the Oracle application server iSQL*Plus
         login pages.  It does this by testing Oracle error responses returned in the HTTP response.

modules/exploits/linux/imap/imap_uw_lsub.rb

@@ -13,7 +13,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'UoW IMAP server LSUB Buffer Overflow',
+      'Name'           => 'UoW IMAP Server LSUB Buffer Overflow',
       'Description'    => %q{
           This module exploits a buffer overflow in the 'LSUB'
         command of the University of Washington IMAP service.

modules/exploits/multi/http/manageengine_search_sqli.rb

@@ -15,7 +15,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info={})
     super(update_info(info,
-      'Name'           => "ManageEngine Security Manager Plus 5.5 build 5505 SQL Injection",
+      'Name'           => "ManageEngine Security Manager Plus 5.5 Build 5505 SQL Injection",
       'Description'    => %q{
           This module exploits a SQL injection found in ManageEngine Security Manager Plus
         advanced search page, which results in remote code execution under the context of

modules/exploits/multi/ids/snort_dce_rpc.rb

@@ -13,7 +13,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'            => 'Snort 2 DCE/RPC preprocessor Buffer Overflow',
+      'Name'            => 'Snort 2 DCE/RPC Preprocessor Buffer Overflow',
       'Description'     => %q{
           This module allows remote attackers to execute arbitrary code by exploiting the
         Snort service via crafted SMB traffic. The vulnerability is due to a boundary

modules/exploits/multi/ntp/ntp_overflow.rb

@@ -13,7 +13,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'NTP daemon readvar Buffer Overflow',
+      'Name'           => 'NTP Daemon readvar Buffer Overflow',
       'Description'    => %q{
         This module exploits a stack based buffer overflow in the
         ntpd and xntpd service. By sending an overly long 'readvar'

modules/exploits/unix/webapp/awstatstotals_multisort.rb

@@ -14,7 +14,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'AWStats Totals =< v1.14 multisort Remote Command Execution',
+      'Name'           => 'AWStats Totals <= v1.14 multisort Remote Command Execution',
       'Description'    => %q{
           This module exploits an arbitrary command execution vulnerability in the
           AWStats Totals PHP script. AWStats Totals version v1.0 - v1.14 are vulnerable.

modules/exploits/unix/webapp/php_wordpress_foxypress.rb

@@ -12,7 +12,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'WordPress plugin Foxypress uploadify.php Arbitrary Code Execution',
+      'Name'           => 'WordPress Plugin Foxypress uploadify.php Arbitrary Code Execution',
       'Description'    => %q{
           This module exploits an arbitrary PHP code execution flaw in the WordPress
         blogging software plugin known as Foxypress. The vulnerability allows for arbitrary

modules/exploits/unix/webapp/squirrelmail_pgp_plugin.rb

@@ -15,7 +15,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'SquirrelMail PGP Plugin command execution (SMTP)',
+      'Name'           => 'SquirrelMail PGP Plugin Command Execution (SMTP)',
       'Description'    => %q{
           This module exploits a command execution vulnerability in the
         PGP plugin of SquirrelMail. This flaw was found while quickly

modules/exploits/windows/browser/cisco_playerpt_setsource_surl.rb

@@ -26,7 +26,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Cisco Linksys PlayerPT ActiveX Control SetSource sURL argument Buffer Overflow',
+      'Name'           => 'Cisco Linksys PlayerPT ActiveX Control SetSource sURL Argument Buffer Overflow',
       'Description'    => %q{
           This module exploits a vulnerability found in Cisco Linksys PlayerPT 1.0.0.15
         as the installed with the web interface of Cisco Linksys WVC200 Wireless-G PTZ

modules/exploits/windows/browser/ubisoft_uplay_cmd_exec.rb

@@ -13,7 +13,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Ubisoft uplay 2.0.3 Active X Control Arbitrary Code Execution',
+      'Name'           => 'Ubisoft uplay 2.0.3 ActiveX Control Arbitrary Code Execution',
       'Description'    => %q{
         The uplay ActiveX component allows an attacker to execute any command line action.
         User must sign in, unless auto-sign in is enabled and uplay must not already be

modules/exploits/windows/fileformat/cyberlink_p2g_bof.rb

@@ -12,7 +12,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'            => 'CyberLink Power2Go name attribute (p2g) Stack Buffer Overflow Exploit',
+      'Name'            => 'CyberLink Power2Go name Attribute (p2g) Stack Buffer Overflow Exploit',
       'Description'     => %q{
           This module exploits a stack buffer overflow in CyberLink Power2Go version 8.x
         The vulnerability is triggered when opening a malformed p2g file containing an overly

modules/exploits/windows/fileformat/esignal_styletemplate_bof.rb

@@ -13,7 +13,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'eSignal and eSignal Pro <= 10.6.2425.1208 file parsing buffer overflow in QUO',
+      'Name'           => 'eSignal and eSignal Pro <= 10.6.2425.1208 File Parsing Buffer Overflow in QUO',
       'Description'    => %q{
         The software is unable to handle the "<StyleTemplate>" files (even
         those original included in the program) like those with the registered

modules/exploits/windows/fileformat/mjm_quickplayer_s3m.rb

@@ -12,7 +12,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'MJM QuickPlayer 1.00 beta 60a / QuickPlayer 2010 .s3m Stack Buffer Overflow',
+      'Name'           => 'MJM QuickPlayer 1.00 Beta 60a / QuickPlayer 2010 .s3m Stack Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in MJM QuickPlayer 1.00 beta 60a
         and QuickPlayer 2010 (Multi-target exploit).  When opening a malicious s3m file in

modules/exploits/windows/fileformat/sascam_get.rb

@@ -12,7 +12,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'SasCam Webcam Server v.2.6.5 Get() method Buffer Overflow',
+      'Name'           => 'SasCam Webcam Server v.2.6.5 Get() Method Buffer Overflow',
       'Description'    => %q{
         The SasCam Webcam Server ActiveX control is vulnerable to a buffer overflow.
         By passing an overly long argument via the Get method, a remote attacker could

modules/exploits/windows/fileformat/xenorate_xpl_bof.rb

@@ -13,7 +13,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Xenorate 2.50 (.xpl) universal Local Buffer Overflow (SEH)',
+      'Name'           => 'Xenorate 2.50 (.xpl) Universal Local Buffer Overflow (SEH)',
       'Description'    => %q{
           This module exploits a stack buffer overflow in Xenorate 2.50
         by creating a specially crafted xpl file.

modules/exploits/windows/ftp/filecopa_list_overflow.rb

@@ -12,7 +12,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'FileCopa FTP Server pre 18 Jul Version',
+      'Name'           => 'FileCopa FTP Server Pre 18 Jul Version',
       'Description'    => %q{
           This module exploits the buffer overflow found in the LIST command
         in fileCOPA FTP server pre 18 Jul 2006 version discovered by www.appsec.ch

modules/exploits/windows/ftp/seagull_list_reply.rb

@@ -11,7 +11,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Seagull FTP v3.3 build 409 Stack Buffer Overflow',
+      'Name'           => 'Seagull FTP v3.3 Build 409 Stack Buffer Overflow',
       'Description'    => %q{
           This module exploits a buffer overflow in the Seagull FTP client that gets
         triggered when the ftp clients processes a response to a LIST command. If the

modules/exploits/windows/games/mohaa_getinfo.rb

@@ -12,7 +12,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Medal Of Honor Allied Assault getinfo Stack Buffer Overflow',
+      'Name'           => 'Medal of Honor Allied Assault getinfo Stack Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack based buffer overflow in the getinfo
         command of Medal Of Honor Allied Assault.

modules/exploits/windows/games/racer_503beta5.rb

@@ -12,7 +12,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Racer v0.5.3 beta 5 Buffer Overflow',
+      'Name'           => 'Racer v0.5.3 Beta 5 Buffer Overflow',
       'Description'    => %q{
           This module explots the Racer Car and Racing Simulator game
         versions v0.5.3 beta 5 and earlier. Both the client and server listen

modules/exploits/windows/local/ms10_015_kitrap0d.rb

@@ -15,7 +15,7 @@ class Metasploit3 < Msf::Exploit::Local
 
   def initialize(info={})
     super( update_info( info,
-      'Name'          => 'Windows SYSTEM escalation via KiTrap0D',
+      'Name'          => 'Windows SYSTEM Escalation via KiTrap0D',
       'Description'   => %q{
         This module will create a new session with SYSTEM privileges via the
         KiTrap0D exlpoit by Tavis Ormandy. If the session is use is already

modules/exploits/windows/misc/windows_rsh.rb

@@ -12,7 +12,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Windows RSH daemon Buffer Overflow',
+      'Name'           => 'Windows RSH Daemon Buffer Overflow',
       'Description'    => %q{
           This module exploits a vulnerabliltiy in Windows RSH daemon 1.8.
         The vulnerability is due to a failure to check for the length of input sent

modules/exploits/windows/scada/iconics_genbroker.rb

@@ -13,7 +13,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
   def initialize(info={})
     super(update_info(info,
-      'Name'           => "Iconics GENESIS32 Integer overflow version 9.21.201.01",
+      'Name'           => "Iconics GENESIS32 Integer Overflow Version 9.21.201.01",
       'Description'    => %q{
           The GenBroker service on port 38080 is affected by three integer overflow
         vulnerabilities while handling opcode 0x4b0, which is caused by abusing the

modules/payloads/singles/aix/ppc/shell_interact.rb

@@ -16,7 +16,7 @@ module Metasploit3
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'          => 'AIX execve shell for inetd',
+      'Name'          => 'AIX execve Shell for inetd',
       'Description'   => 'Simply execve /bin/sh (for inetd programs)',
       'Author'        => 'jduck',
       'License'       => MSF_LICENSE,

modules/payloads/singles/cmd/unix/reverse.rb

@@ -15,7 +15,7 @@ module Metasploit3
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'          => 'Unix Command Shell, Double reverse TCP (telnet)',
+      'Name'          => 'Unix Command Shell, Double Reverse TCP (telnet)',
       'Description'   => 'Creates an interactive shell through two inbound connections',
       'Author'        => 'hdm',
       'License'       => MSF_LICENSE,

modules/payloads/singles/cmd/unix/reverse_openssl.rb

@@ -15,7 +15,7 @@ module Metasploit3
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'          => 'Unix Command Shell, Double reverse TCP SSL (openssl)',
+      'Name'          => 'Unix Command Shell, Double Reverse TCP SSL (openssl)',
       'Description'   => 'Creates an interactive shell through two inbound connections',
       'Author'        => 'hdm',
       'License'       => MSF_LICENSE,

modules/payloads/singles/cmd/windows/reverse_perl.rb

@@ -15,7 +15,7 @@ module Metasploit3
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'          => 'Windows Command, Double reverse TCP connection (via Perl)',
+      'Name'          => 'Windows Command, Double Reverse TCP connection (via Perl)',
       'Description'   => 'Creates an interactive shell via perl',
       'Author'        => ['cazz', 'patrick'],
       'License'       => BSD_LICENSE,

modules/payloads/singles/osx/x64/say.rb

@@ -12,7 +12,7 @@ module Metasploit3
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'          => 'OSX X64 say Shellcode',
+      'Name'          => 'OS X x64 say Shellcode',
       'Description'   => 'Say an arbitrary string outloud using Mac OS X text2speech',
       'Author'        => 'nemo <nemo[at]felinemenace.org>',
       'License'       => MSF_LICENSE,

modules/payloads/singles/php/reverse_perl.rb

@@ -17,7 +17,7 @@ module Metasploit3
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'          => 'PHP Command, Double reverse TCP connection (via Perl)',
+      'Name'          => 'PHP Command, Double Reverse TCP Connection (via Perl)',
       'Description'   => 'Creates an interactive shell via perl',
       'Author'        => 'cazz',
       'License'       => BSD_LICENSE,

modules/payloads/stagers/windows/bind_tcp_rc4.rb

@@ -20,7 +20,7 @@ module Metasploit3
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'          => 'Bind TCP Stager (RC4 stage encryption)',
+      'Name'          => 'Bind TCP Stager (RC4 Stage Encryption)',
       'Description'   => 'Listen for a connection',
       'Author'        => ['hdm', 'skape', 'sf', 'mihi'],
       'License'       => MSF_LICENSE,

modules/payloads/stagers/windows/reverse_tcp_rc4.rb

@@ -20,7 +20,7 @@ module Metasploit3
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'          => 'Reverse TCP Stager (RC4 stage encryption)',
+      'Name'          => 'Reverse TCP Stager (RC4 Stage Encryption)',
       'Description'   => 'Connect back to the attacker',
       'Author'        => ['hdm', 'skape', 'sf', 'mihi'],
       'License'       => MSF_LICENSE,

modules/payloads/stagers/windows/reverse_tcp_rc4_dns.rb

@@ -20,7 +20,7 @@ module Metasploit3
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'          => 'Reverse TCP Stager (RC4 stage encryption DNS)',
+      'Name'          => 'Reverse TCP Stager (RC4 Stage Encryption DNS)',
       'Description'   => 'Connect back to the attacker',
       'Author'        => ['hdm', 'skape', 'sf', 'mihi', 'RageLtMan'],
       'License'       => MSF_LICENSE,

modules/post/linux/manage/download_exec.rb

@@ -13,7 +13,7 @@ class Metasploit3 < Msf::Post
 
   def initialize(info={})
     super( update_info( info,
-      'Name'          => 'Linux Manage Download and Exececute',
+      'Name'          => 'Linux Manage Download and Execute',
       'Description'   => %q{
           This module downloads and runs a file with bash. It first tries to uses curl as
         its HTTP client and then wget if it's not found. Bash found in the PATH is used to

tools/msftidy.rb

@@ -326,7 +326,7 @@ class Msftidy
     if @source =~ /'Name'[[:space:]]*=>[[:space:]]*['"](.+)['"],*$/
       words = $1.split
       words.each do |word|
-        if %w{and or the for to in of as with a an on at via}.include?(word)
+        if %w{and or the for to in of as with a an on at via from}.include?(word)
           next
         elsif %w{pbot}.include?(word)
         elsif word =~ /^[a-z]+$/