Various code format, style changes, file moves

As per Egypt's suggestions.

Author: OJ

lib/msf/core/handler/reverse_hop_http.rb

@@ -252,10 +252,10 @@ def send_new_stage(uri)
     url = full_uri + conn_id + "/\x00"
 
     print_status("Preparing stage for next session #{conn_id}")
-    blob = stage_payload({
-      :uuid => uuid,
-      :uri  => conn_id
-    })
+    blob = stage_payload(
+      uuid: uuid,
+      uri:  conn_id
+    )
 
     #send up
     crequest = mclient.request_raw(

lib/msf/core/handler/reverse_http.rb

@@ -325,10 +325,10 @@ def on_request(cli, req, obj)
 
         # generate the stage, but pass in the existing UUID and connection id so that
         # we don't get new ones generated.
-        blob = obj.stage_payload({
-          :uuid => uuid,
-          :uri  => conn_id
-        })
+        blob = obj.stage_payload(
+          uuid: uuid,
+          uri:  conn_id
+        )
 
         resp.body = encode_stage(blob)
 

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

@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/core'
-require 'msf/core/transport_config'
+require 'msf/core/payload/transport_config'
 
 module Msf
 
@@ -15,26 +15,24 @@ module Msf
 
 module Payload::Linux::BindTcp
 
-  include Msf::TransportConfig
+  include Msf::Payload::TransportConfig
   include Msf::Payload::Linux
 
   #
   # Generate the first stage
   #
   def generate
-
-    # Generate the simple version of this stager if we don't have enough space
-    if self.available_space.nil? || required_space > self.available_space
-      return generate_bind_tcp({
-        :port => datastore['LPORT']
-      })
-    end
-
     conf = {
-      :port     => datastore['LPORT'],
-      :reliable => true
+      port:     datastore['LPORT'],
+      reliable: false
     }
 
+    # Generate the more advanced stager if we have the space
+    unless self.available_space.nil? || required_space > self.available_space
+      conf[:exitfunk] = datastore['EXITFUNC'],
+      conf[:reliable] = true
+    end
+
     generate_bind_tcp(conf)
   end
 

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

@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/core'
-require 'msf/core/transport_config'
+require 'msf/core/payload/transport_config'
 require 'msf/core/payload/linux'
 
 module Msf
@@ -16,30 +16,26 @@ module Msf
 
 module Payload::Linux::ReverseTcp
 
-  include Msf::TransportConfig
+  include Msf::Payload::TransportConfig
   include Msf::Payload::Linux
 
   #
   # Generate the first stage
   #
   def generate
-    # Generate the simple version of this stager if we don't have enough space
-    if self.available_space.nil? || required_space > self.available_space
-      return generate_reverse_tcp(
-        port: datastore['LPORT'],
-        host: datastore['LHOST'],
-        retry_count: datastore['ReverseConnectRetries'],
-      )
-    end
-
     conf = {
-      host: datastore['LHOST'],
-      port: datastore['LPORT'],
+      port:        datastore['LPORT'],
+      host:        datastore['LHOST'],
       retry_count: datastore['ReverseConnectRetries'],
-      exitfunk: datastore['EXITFUNC'],
-      reliable: true
+      reliable:    false
     }
 
+    # Generate the advanced stager if we have space
+    unless self.available_space.nil? || required_space > self.available_space
+      conf[:exitfunk] = datastore['EXITFUNC']
+      conf[:reliable] = true
+    end
+
     generate_reverse_tcp(conf)
   end
 
@@ -79,8 +75,8 @@ def required_space
   #
   def asm_reverse_tcp(opts={})
     # TODO: reliability is coming
-    #retry_count  = [opts[:retry_count].to_i, 1].max
-    #reliable     = opts[:reliable]
+    retry_count  = [opts[:retry_count].to_i, 1].max
+    reliable     = opts[:reliable]
     encoded_port = "0x%.8x" % [opts[:port].to_i,2].pack("vn").unpack("N").first
     encoded_host = "0x%.8x" % Rex::Socket.addr_aton(opts[:host]||"127.127.127.127").unpack("V").first
 

lib/msf/core/transport_config.rb renamed to lib/msf/core/payload/transport_config.rb

@@ -6,7 +6,7 @@
 # This module contains helper functions for creating the transport
 # configuration stubs that are used for Meterpreter payloads.
 ##
-module Msf::TransportConfig
+module Msf::Payload::TransportConfig
 
   include Msf::Payload::UUIDOptions
 

lib/msf/core/payload/windows/bind_tcp.rb

@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/core'
-require 'msf/core/transport_config'
+require 'msf/core/payload/transport_config'
 require 'msf/core/payload/windows/block_api'
 require 'msf/core/payload/windows/exitfunk'
 
@@ -17,7 +17,7 @@ module Msf
 
 module Payload::Windows::BindTcp
 
-  include Msf::TransportConfig
+  include Msf::Payload::TransportConfig
   include Msf::Payload::Windows
   include Msf::Payload::Windows::BlockApi
   include Msf::Payload::Windows::Exitfunk
@@ -26,21 +26,17 @@ module Payload::Windows::BindTcp
   # Generate the first stage
   #
   def generate
-
-    # Generate the simple version of this stager if we don't have enough space
-    if self.available_space.nil? || required_space > self.available_space
-      return generate_bind_tcp({
-        :port => datastore['LPORT'].to_i,
-        :reliable => false
-      })
-    end
-
     conf = {
-      :port     => datastore['LPORT'].to_i,
-      :exitfunk => datastore['EXITFUNC'],
-      :reliable => true
+      port:     datastore['LPORT'],
+      reliable: false
     }
 
+    # Generate the more advanced stager if we have the space
+    unless self.available_space.nil? || required_space > self.available_space
+      conf[:exitfunk] = datastore['EXITFUNC'],
+      conf[:reliable] = true
+    end
+
     generate_bind_tcp(conf)
   end
 

lib/msf/core/payload/windows/meterpreter_loader.rb

@@ -71,9 +71,9 @@ def stage_meterpreter(stageless=false)
     dll, offset = load_rdi_dll(MetasploitPayloads.meterpreter_path('metsrv', 'x86.dll'))
 
     asm_opts = {
-      :rdi_offset => offset,
-      :length     => dll.length,
-      :stageless  => stageless
+      rdi_offset: offset,
+      length:     dll.length,
+      stageless:  stageless
     }
 
     asm = asm_invoke_metsrv(asm_opts)
@@ -82,9 +82,8 @@ def stage_meterpreter(stageless=false)
     bootstrap = Metasm::Shellcode.assemble(Metasm::X86.new, asm).encode_string
 
     # sanity check bootstrap length to ensure we dont overwrite the DOS headers e_lfanew entry
-    if( bootstrap.length > 62 )
-      print_error( "Meterpreter loader (x86) generated an oversized bootstrap!" )
-      return
+    if bootstrap.length > 62
+      raise RuntimeError, "Meterpreter loader (x86) generated an oversized bootstrap!"
     end
 
     # patch the bootstrap code into the dll's DOS header...

lib/msf/core/payload/windows/reflectivedllinject.rb

@@ -75,8 +75,8 @@ def stage_payload
     dll, offset = load_rdi_dll(library_path)
 
     asm_opts = {
-      :rdi_offset => offset,
-      :exitfunk   => 'thread'     # default to 'thread' for migration
+      rdi_offset: offset,
+      exitfunk:   'thread'  # default to 'thread' for migration
     }
 
     asm = asm_invoke_dll(asm_opts)
@@ -85,9 +85,8 @@ def stage_payload
     bootstrap = Metasm::Shellcode.assemble(Metasm::X86.new, asm).encode_string
 
     # sanity check bootstrap length to ensure we dont overwrite the DOS headers e_lfanew entry
-    if( bootstrap.length > 62 )
-      print_error( "Reflective Dll Injection (x86) generated an oversized bootstrap!" )
-      return
+    if bootstrap.length > 62
+      raise RuntimeError, "Reflective DLL Injection (x86) generated an oversized bootstrap!"
     end
 
     # patch the bootstrap code into the dll's DOS header...

lib/msf/core/payload/windows/reverse_http.rb

@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/core'
-require 'msf/core/transport_config'
+require 'msf/core/payload/transport_config'
 require 'msf/core/payload/windows/block_api'
 require 'msf/core/payload/windows/exitfunk'
 require 'msf/core/payload/uuid_options'
@@ -18,7 +18,7 @@ module Msf
 
 module Payload::Windows::ReverseHttp
 
-  include Msf::TransportConfig
+  include Msf::Payload::TransportConfig
   include Msf::Payload::Windows
   include Msf::Payload::Windows::BlockApi
   include Msf::Payload::Windows::Exitfunk

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

@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/core'
-require 'msf/core/transport_config'
+require 'msf/core/payload/transport_config'
 require 'msf/core/payload/windows/block_api'
 require 'msf/core/payload/windows/exitfunk'
 
@@ -15,7 +15,7 @@ module Msf
 
 module Payload::Windows::ReverseTcp
 
-  include Msf::TransportConfig
+  include Msf::Payload::TransportConfig
   include Msf::Payload::Windows
   include Msf::Payload::Windows::BlockApi
   include Msf::Payload::Windows::Exitfunk
@@ -24,23 +24,19 @@ module Payload::Windows::ReverseTcp
   # Generate the first stage
   #
   def generate
-    # Generate the simple version of this stager if we don't have enough space
-    if self.available_space.nil? || required_space > self.available_space
-      return generate_reverse_tcp(
-        port: datastore['LPORT'],
-        host: datastore['LHOST'],
-        retry_count: datastore['ReverseConnectRetries'],
-      )
-    end
-
     conf = {
-      host: datastore['LHOST'],
-      port: datastore['LPORT'],
+      port:        datastore['LPORT'],
+      host:        datastore['LHOST'],
       retry_count: datastore['ReverseConnectRetries'],
-      exitfunk: datastore['EXITFUNC'],
-      reliable: true
+      reliable:    false
     }
 
+    # Generate the advanced stager if we have space
+    unless self.available_space.nil? || required_space > self.available_space
+      conf[:exitfunk] = datastore['EXITFUNC']
+      conf[:reliable] = true
+    end
+
     generate_reverse_tcp(conf)
   end