More inconsistencies

Author: g0tmi1k

lib/msf/core/db_manager/session.rb

@@ -191,7 +191,7 @@ def create_mdm_session_from_session(opts)
         via_payload: session.via_payload,
       }
 
-      # In the case of multi handler we cannot yet determine the true
+      # In the case of exploit/multi/handler we cannot yet determine the true
       # exploit responsible. But we can at least show the parent versus
       # just the generic handler:
       if session.via_exploit == "exploit/multi/handler" and sess_data[:datastore]['ParentModule']

lib/msf/core/exploit/http/server.rb

@@ -497,7 +497,7 @@ def get_uri(cli=self.cli)
   # bind payload but there's nothing we can do about it.
   #
   # NOTE: The address will be *incorrect* in the following two situations:
-  # 1. LHOST is pointed at a multi/handler on some other box.
+  # 1. LHOST is pointed at a exploit/multi/handler on some other box.
   # 2. SRVHOST has a value of '0.0.0.0', the user is behind NAT, and we're
   #    using a bind payload.  In that case, we don't have an LHOST and
   #    the source address will be internal.

modules/post/windows/manage/multi_meterpreter_inject.rb

@@ -117,7 +117,7 @@ def create_multi_handler(payload_to_inject,rport,rhost = '0.0.0.0')
       'Payload'        => mul.datastore['PAYLOAD'],
       'RunAsJob'       => true
     )
-    print_good("Multi/Handler started!")
+    print_good("exploit/multi/handler started!")
   end
 
   # Function for Creating the Payload

scripts/meterpreter/multi_meter_inject.rb

@@ -20,11 +20,11 @@
 start_handler = nil
 @exec_opts = Rex::Parser::Arguments.new(
   "-h"  => [ false,  "Help menu." ],
-  "-p"  => [ true,   "The port on the remote host where Metasploit is listening (default: 4444)"],
-  "-m"  => [ false,  "Start exploit/multi/handler for return connection"],
-  "-pt" => [ true,   "Specify Reverse Connection Meterpreter Payload. Default windows/meterpreter/reverse_tcp"],
-  "-mr" => [ true,   "Provide Multiple IP Addresses for Connections separated by comma."],
-  "-mp" => [ true,   "Provide Multiple PID for connections separated by comma one per IP."]
+  "-p"  => [ true,   "The port on the remote host where Metasploit is listening (default: 4444)."],
+  "-m"  => [ false,  "Start exploit/multi/handler for return connection."],
+  "-pt" => [ true,   "Specify reverse connection Meterpreter payload. Default: windows/meterpreter/reverse_tcp"],
+  "-mr" => [ true,   "Provide multiple IP addresses for connections separated by comma."],
+  "-mp" => [ true,   "Provide multiple PID for connections separated by comma one per IP."]
 )
 meter_type = client.platform
 
@@ -33,17 +33,17 @@
 # Usage Message Function
 #-------------------------------------------------------------------------------
 def usage
-  print_line "Meterpreter Script for injecting a reverce tcp Meterpreter Payload"
-  print_line "in to memory of multiple PIDs, if none is provided a notepad process."
-  print_line "will be created and a Meterpreter Payload will be injected in to each."
+  print_line "Meterpreter script for injecting a reverce tcp Meterpreter payload"
+  print_line "in to memory of multiple PIDs. If none is provided, a notepad process"
+  print_line "will be created and a Meterpreter payload will be injected in to each."
   print_line(@exec_opts.usage)
   raise Rex::Script::Completed
 end
 
 # Wrong Meterpreter Version Message Function
 #-------------------------------------------------------------------------------
 def wrong_meter_version(meter = meter_type)
-  print_error("#{meter} version of Meterpreter is not supported with this Script!")
+  print_error("#{meter} version of Meterpreter is not supported with this script!")
   raise Rex::Script::Completed
 end
 
@@ -62,12 +62,12 @@ def inject(target_pid, payload_to_inject)
     host_process.thread.create(mem, 0)
     print_good("Successfully injected Meterpreter in to process: #{target_pid}")
   rescue::Exception => e
-    print_error("Failed to Inject Payload to #{target_pid}!")
+    print_error("Failed to Inject payload to #{target_pid}!")
     print_error(e)
   end
 end
 
-# Function for Creation of Connection Handler
+# Function for creation of connection handler
 #-------------------------------------------------------------------------------
 def create_multi_handler(payload_to_inject)
   mul = @client.framework.exploits.create("multi/handler")
@@ -84,7 +84,7 @@ def create_multi_handler(payload_to_inject)
 
 end
 
-# Function for Creating the Payload
+# Function for creating the payload
 #-------------------------------------------------------------------------------
 def create_payload(payload_type,lhost,lport)
   print_status("Creating a reverse meterpreter stager: LHOST=#{lhost} LPORT=#{lport}")
@@ -98,7 +98,7 @@ def create_payload(payload_type,lhost,lport)
 # Function starting notepad.exe process
 #-------------------------------------------------------------------------------
 def start_proc()
-  print_good("Starting Notepad.exe to house Meterpreter Session.")
+  print_good("Starting Notepad.exe to house Meterpreter session.")
   proc = client.sys.process.execute('notepad.exe', nil, {'Hidden' => true })
   print_good("Process created with pid #{proc.pid}")
   return proc.pid
@@ -121,12 +121,12 @@ def start_proc()
   end
 }
 
-# Check for Version of Meterpreter
+# Check for version of Meterpreter
 wrong_meter_version(meter_type) if meter_type !~ /win32|win64/i
-# Create a Multi Handler is Desired
+# Create a exploit/multi/handler if desired
 create_multi_handler(payload_type) if start_handler
 
-# Check to make sure a PID or Program name where provided
+# Check to make sure a PID or program name where provided
 
 if multi_ip
   if multi_pid
@@ -149,4 +149,3 @@ def start_proc()
 else
   print_error("You must provide at least one IP!")
 end
-

scripts/meterpreter/persistence.rb

@@ -138,7 +138,7 @@ def write_script_to_target(target_dir,vbs)
   return tempvbs
 end
 
-# Function for setting multi handler for autocon
+# Function for setting exploit/multi/handler for autocon
 #-------------------------------------------------------------------------------
 def set_handler(selected_payload,rhost,rport)
   print_status("Starting connection handler at port #{rport} for #{selected_payload}")
@@ -154,7 +154,7 @@ def set_handler(selected_payload,rhost,rport)
     'Payload'        => mul.datastore['PAYLOAD'],
     'RunAsJob'       => true
   )
-  print_good("Multi/Handler started!")
+  print_good("exploit/multi/handler started!")
 end
 
 # Function to execute script on target and return the PID of the process