Naming Consistencies

modules/auxiliary/scanner/http/apache_mod_cgi_bash_env.rb

@@ -12,7 +12,7 @@ def initialize(info = {})
     super(
       update_info(
         info,
-        'Name' => 'Apache mod_cgi Bash Environment Variable Injection (Shellshock) Scanner',
+        'Name' => 'Apache mod_cgi Bash Environment Variable Code Injection Scanner (Shellshock)',
         'Description' => %q{
           This module scans for the Shellshock vulnerability, a flaw in how the Bash shell
           handles external environment variables. This module targets CGI scripts in the

modules/auxiliary/server/dhclient_bash_env.rb

@@ -15,6 +15,8 @@ def initialize
         to DHCP requests with a malicious hostname, domainname, and URL which are then
         passed to the configuration scripts as environment variables, resulting in code
         execution.
+
+        See exploits/unix/dhcp/dhclient_bash_env for a version which uses /etc/crontab
       },
       'Author' => [
         'scriptjunkie', 'apconole[at]yahoo.com', # Original DHCP Server auxiliary module

modules/auxiliary/server/pxeexploit.rb → modules/auxiliary/server/pxe_boot.rb

@@ -6,16 +6,18 @@
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::TFTPServer
   include Msf::Auxiliary::Report
+  include Msf::Module::Deprecated
+  moved_from 'auxiliary/server/pxeexploit'
 
   def initialize
     super(
-      'Name' => 'PXE Boot Exploit Server',
+      'Name' => 'PXE Boot Server',
       'Description' => %q{
         This module provides a PXE server, running a DHCP and TFTP server.
-        The default configuration loads a linux kernel and initrd into memory that
+        The default configuration loads a Linux kernel and initrd into memory that
         reads the hard drive; placing a payload to install metsvc, disable the
         firewall, and add a new user metasploit on any Windows partition seen,
-        and add a uid 0 user with username and password metasploit to any linux
+        and add a uid 0 user with username and password metasploit to any Linux
         partition seen. The windows user will have the password p@SSw0rd!123456
         (in case of complexity requirements) and will be added to the administrators
         group.

modules/exploits/linux/http/ipfire_bashbug_exec.rb

@@ -11,7 +11,7 @@ def initialize(info = {})
     super(
       update_info(
         info,
-        'Name' => 'IPFire Bash Environment Variable Injection (Shellshock)',
+        'Name' => 'IPFire Bash Environment Variable Code Injection (Shellshock)',
         'Description' => %q{
           IPFire, a free linux based open source firewall distribution,
           version <= 2.15 Update Core 82 contains an authenticated remote

modules/exploits/osx/local/vmware_bash_function_root.rb

@@ -15,7 +15,7 @@ def initialize(info = {})
     super(
       update_info(
         info,
-        'Name' => 'OS X VMWare Fusion Privilege Escalation via Bash Environment Code Injection (Shellshock)',
+        'Name' => 'OS X VMWare Fusion Privilege Escalation via Bash Environment Variable Code Injection (Shellshock)',
         'Description' => %q{
           This module exploits the Shellshock vulnerability, a flaw in how the Bash shell
           handles external environment variables. This module targets the VMWare Fusion

modules/exploits/unix/dhcp/bash_environment.rb → modules/exploits/unix/dhcp/dhclient_bash_env.rb

@@ -7,12 +7,14 @@ class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::DHCPServer
+  include Msf::Module::Deprecated
+  moved_from 'exploits/unix/dhcp/bash_environment'
 
   def initialize(info = {})
     super(
       update_info(
         info,
-        'Name' => 'Dhclient Bash Environment Variable Injection (Shellshock)',
+        'Name' => 'DHCP Client Bash Environment Variable Code Injection (Shellshock)',
         'Description' => %q{
           This module exploits the Shellshock vulnerability, a flaw in how the Bash shell
           handles external environment variables. This module targets dhclient by responding
@@ -21,6 +23,8 @@ def initialize(info = {})
           execution. Due to length restrictions and the unusual networking scenario at the
           time of exploitation, this module achieves code execution by writing the payload
           into /etc/crontab and then cleaning it up after a session is created.
+
+          See auxiliary/server/dhclient_bash_env for a version which has more payloads options
         },
         'Author' => [
           'Stephane Chazelas', # Vulnerability discovery

modules/exploits/unix/smtp/qmail_bash_env_exec.rb

@@ -12,7 +12,7 @@ def initialize(info = {})
     super(
       update_info(
         info,
-        'Name' => 'Qmail SMTP Bash Environment Variable Injection (Shellshock)',
+        'Name' => 'Qmail SMTP Bash Environment Variable Code Injection (Shellshock)',
         'Description' => %q{
           This module exploits a shellshock vulnerability on Qmail, a public
           domain MTA written in C that runs on Unix systems.

modules/exploits/windows/local/pxeexploit.rb → modules/exploits/windows/local/pxe_boot.rb

@@ -8,16 +8,20 @@ class MetasploitModule < Msf::Exploit::Remote
 
   include Msf::Exploit::Remote::TFTPServer
   include Msf::Auxiliary::Report
+  include Msf::Module::Deprecated
+  moved_from 'exploits/windows/local/pxeexploit'
 
   def initialize
     super(
-      'Name' => 'PXE Exploit Server',
+      'Name' => 'PXE Boot Server',
       'Description' => %q{
         This module provides a PXE server, running a DHCP and TFTP server.
-        The default configuration loads a linux kernel and initrd into memory that
+        The default configuration loads a Linux kernel and initrd into memory that
         reads the hard drive; placing the payload on the hard drive of any Windows
         partition seen.
 
+        See auxiliary/server/pxe_boot for a version which has more payloads options.
+
         Note: the displayed IP address of a target is the address this DHCP server
         handed out, not the "normal" IP address the host uses.
       },

modules/post/windows/manage/pxeexploit.rb → modules/post/windows/manage/pxe_boot.rb

@@ -5,21 +5,24 @@
 
 class MetasploitModule < Msf::Post
   include Msf::Auxiliary::Report
+  include Msf::Module::Deprecated
+  moved_from 'post/windows/manage/pxeexploit'
 
   def initialize
     super(
-      'Name' => 'Windows Manage PXE Exploit Server',
+      'Name' => 'Windows Manage PXE Boot Server',
       'Description' => %q{
         This module provides a PXE server, running a DHCP and TFTP server.
-        The default configuration loads a linux kernel and initrd into memory that
+        The default configuration loads a Linux kernel and initrd into memory that
         reads the hard drive; placing a payload to install metsvc, disable the
         firewall, and add a new user metasploit on any Windows partition seen,
-        and add a uid 0 user with username and password metasploit to any linux
+        and add a uid 0 user with username and password metasploit to any Linux
         partition seen. The windows user will have the password p@SSw0rd!123456
         (in case of complexity requirements) and will be added to the administrators
         group.
 
-        See exploit/windows/misc/pxesploit for a version to deliver a specific payload.
+        See auxiliary/server/pxe_boot for a version which has more payloads options.
+        See exploit/windows/local/pxe_boot for a version to deliver a specific Windows payload.
 
         Note: the displayed IP address of a target is the address this DHCP server
         handed out, not the "normal" IP address the host uses.