Rejig transport config into module

Adjust a few other things along the way, including tidying of code,
removing of dead stuff.

Author: OJ

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

@@ -1,6 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/core'
+require 'msf/core/transport_config'
 
 module Msf
 
@@ -14,6 +15,7 @@ module Msf
 
 module Payload::Linux::BindTcp
 
+  include Msf::TransportConfig
   include Msf::Payload::Linux
 
   #
@@ -44,14 +46,8 @@ def generate_bind_tcp(opts={})
     Metasm::Shellcode.assemble(Metasm::X86.new, asm).encode_string
   end
 
-  def generate_transport_config(opts={})
-    {
-      :scheme       => 'tcp',
-      :lport        => datastore['LPORT'].to_i,
-      :comm_timeout => datastore['SessionCommunicationTimeout'].to_i,
-      :retry_total  => datastore['SessionRetryTotal'].to_i,
-      :retry_wait   => datastore['SessionRetryWait'].to_i
-    }
+  def transport_config(opts={})
+    transport_config_bind_tcp(opts)
   end
 
   #

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

@@ -1,6 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/core'
+require 'msf/core/transport_config'
 
 module Msf
 
@@ -14,6 +15,7 @@ module Msf
 
 module Payload::Linux::ReverseTcp
 
+  include Msf::TransportConfig
   include Msf::Payload::Linux
 
   #
@@ -40,15 +42,8 @@ def generate
     generate_reverse_tcp(conf)
   end
 
-  def generate_transport_config(opts={})
-    {
-      :scheme       => 'tcp',
-      :lhost        => datastore['LHOST'],
-      :lport        => datastore['LPORT'].to_i,
-      :comm_timeout => datastore['SessionCommunicationTimeout'].to_i,
-      :retry_total  => datastore['SessionRetryTotal'].to_i,
-      :retry_wait   => datastore['SessionRetryWait'].to_i
-    }
+  def transport_config(opts={})
+    transport_config_reverse_tcp(opts)
   end
 
   #

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

@@ -1,6 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/core'
+require 'msf/core/transport_config'
 require 'msf/core/payload/windows/block_api'
 require 'msf/core/payload/windows/exitfunk'
 
@@ -16,14 +17,11 @@ module Msf
 
 module Payload::Windows::BindTcp
 
+  include Msf::TransportConfig
   include Msf::Payload::Windows
   include Msf::Payload::Windows::BlockApi
   include Msf::Payload::Windows::Exitfunk
 
-  def close_listen_socket
-    datastore['StagerCloseListenSocket'].nil? || datastore['StagerCloseListenSocket'] == true
-  end
-
   #
   # Generate the first stage
   #
@@ -45,14 +43,8 @@ def generate
     generate_bind_tcp(conf)
   end
 
-  def generate_transport_config(opts={})
-    {
-      :scheme       => 'tcp',
-      :lport        => datastore['LPORT'].to_i,
-      :comm_timeout => datastore['SessionCommunicationTimeout'].to_i,
-      :retry_total  => datastore['SessionRetryTotal'].to_i,
-      :retry_wait   => datastore['SessionRetryWait'].to_i
-    }
+  def transport_config(opts={})
+    transport_config_bind_tcp(opts)
   end
 
   #
@@ -86,11 +78,6 @@ def required_space
     # Reliability checks add 4 bytes for the first check, 5 per recv check (2)
     space += 14
 
-    # if the payload doesn't need the listen socket closed then we save space. This is
-    # the case for meterpreter payloads, as metsrv now closes the listen socket once it
-    # kicks off (needed for more reliable shells).
-    space -= 8 unless close_listen_socket
-
     # The final estimated size
     space
   end
@@ -175,13 +162,11 @@ def asm_bind_tcp(opts={})
         push 0xE13BEC74        ; hash( "ws2_32.dll", "accept" )
         call ebp               ; accept( s, 0, 0 );
 
-        push edi               ; push the listening socket, either to close, or to pass on
+        push edi               ; push the listening socket
         xchg edi, eax          ; replace the listening socket with the new connected socket for further comms
         push 0x614D6E75        ; hash( "ws2_32.dll", "closesocket" )
         call ebp               ; closesocket( s );
-      ^
 
-      asm << %Q^
       recv:
         ; Receive the size of the incoming second stage...
         push 0                 ; flags

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

@@ -5,14 +5,12 @@
 
 module Msf
 
-
 ###
 #
 # Common module stub for ARCH_X86 payloads that make use of Meterpreter.
 #
 ###
 
-
 module Payload::Windows::MeterpreterLoader
 
   include Msf::ReflectiveDLLLoader
@@ -34,7 +32,7 @@ def initialize(info = {})
       ))
   end
 
-  def asm_invoke_dll(opts={})
+  def asm_invoke_metsrv(opts={})
     asm = %Q^
         ; prologue
           dec ebp               ; 'M'
@@ -69,7 +67,7 @@ def stage_meterpreter
       :length     => dll.length
     }
 
-    asm = asm_invoke_dll(asm_opts)
+    asm = asm_invoke_metsrv(asm_opts)
 
     # generate the bootstrap asm
     bootstrap = Metasm::Shellcode.assemble(Metasm::X86.new, asm).encode_string

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

@@ -1,6 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/core'
+require 'msf/core/transport_config'
 require 'msf/core/payload/windows/block_api'
 require 'msf/core/payload/windows/exitfunk'
 
@@ -14,6 +15,7 @@ module Msf
 
 module Payload::Windows::ReverseTcp
 
+  include Msf::TransportConfig
   include Msf::Payload::Windows
   include Msf::Payload::Windows::BlockApi
   include Msf::Payload::Windows::Exitfunk
@@ -42,15 +44,8 @@ def generate
     generate_reverse_tcp(conf)
   end
 
-  def generate_transport_config(opts={})
-    {
-      :scheme       => 'tcp',
-      :lhost        => datastore['LHOST'],
-      :lport        => datastore['LPORT'].to_i,
-      :comm_timeout => datastore['SessionCommunicationTimeout'].to_i,
-      :retry_total  => datastore['SessionRetryTotal'].to_i,
-      :retry_wait   => datastore['SessionRetryWait'].to_i
-    }
+  def transport_config(opts={})
+    transport_config_reverse_tcp(opts)
   end
 
   #

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

@@ -1,6 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/core'
+require 'msf/core/transport_config'
 require 'msf/core/payload/windows/block_api'
 require 'msf/core/payload/windows/exitfunk'
 require 'msf/core/payload/windows/reverse_http'
@@ -19,13 +20,6 @@ module Payload::Windows::ReverseWinHttp
 
   include Msf::Payload::Windows::ReverseHttp
 
-  #
-  # Register reverse_winhttp specific options
-  #
-  def initialize(*args)
-    super
-  end
-
   #
   # Generate the first stage
   #
@@ -52,25 +46,8 @@ def generate
     generate_reverse_winhttp(conf)
   end
 
-  def generate_transport_config(opts={})
-    # most cases we'll haev a URI already, but in case we don't
-    # we should ask for a connect to happen given that this is
-    # going up as part of the stage.
-    uri = opts[:uri]
-    unless uri
-      sum = uri_checksum_lookup(:connect)
-      uri = generate_uri_uuid(sum, opts[:uuid])
-    end
-
-    {
-      :scheme       => 'http',
-      :lhost        => datastore['LHOST'],
-      :lport        => datastore['LPORT'].to_i,
-      :uri          => uri,
-      :comm_timeout => datastore['SessionCommunicationTimeout'].to_i,
-      :retry_total  => datastore['SessionRetryTotal'].to_i,
-      :retry_wait   => datastore['SessionRetryWait'].to_i
-    }
+  def transport_config(opts={})
+    transport_config_reverse_http(opts)
   end
   #
   # Generate and compile the stager

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

@@ -1,6 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/core'
+require 'msf/core/transport_config'
 require 'msf/core/payload/windows/reverse_winhttp'
 require 'msf/core/payload/windows/verify_ssl'
 require 'rex/payloads/meterpreter/uri_checksum'
@@ -17,6 +18,7 @@ module Msf
 
 module Payload::Windows::ReverseWinHttps
 
+  include Msf::TransportConfig
   include Msf::Payload::Windows::ReverseWinHttp
   include Msf::Payload::Windows::VerifySsl
 
@@ -83,14 +85,8 @@ def generate
     generate_reverse_winhttps(conf)
   end
 
-  def generate_transport_config(opts={})
-    config = super
-
-    config[:scheme] = 'https'
-    config[:ssl_cert_hash] = get_ssl_cert_hash(datastore['StagerVerifySSLCert'],
-                                               datastore['HandlerSSLCert'])
-
-    config
+  def transport_config(opts={})
+    transport_config_reverse_https(opts)
   end
 
   #