Final touches to make MSF happy with all refactorings

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

@@ -0,0 +1,28 @@
+# -*- coding: binary -*-
+
+require 'msf/core'
+require 'msf/core/payload/transport_config'
+
+module Msf
+
+###
+#
+# Complex payload generation for Android that speaks TCP
+#
+###
+
+module Payload::Android::ReverseTcp
+
+  include Msf::Payload::TransportConfig
+  include Msf::Payload::Android
+
+  #
+  # Generate the transport-specific configuration
+  #
+  def transport_config(opts={})
+    transport_config_reverse_tcp(opts)
+  end
+
+end
+end
+

modules/payloads/stagers/android/reverse_http.rb

@@ -15,7 +15,6 @@ module MetasploitModule
   include Msf::Payload::Stager
   include Msf::Payload::Android
   include Msf::Payload::Android::ReverseHttp
-  include Msf::Payload::UUID::Options
 
   def initialize(info = {})
     super(merge_info(info,

modules/payloads/stagers/android/reverse_https.rb

@@ -14,7 +14,7 @@ module MetasploitModule
 
   include Msf::Payload::Stager
   include Msf::Payload::Android
-  include Msf::Payload::Android::ReverseHttps
+  include Msf::Payload::Android::ReverseHttp
 
   def initialize(info = {})
     super(merge_info(info,
@@ -25,6 +25,7 @@ module MetasploitModule
       'Platform'    => 'android',
       'Arch'        => ARCH_DALVIK,
       'Handler'     => Msf::Handler::ReverseHttps,
+      'Convention'  => 'javaurl',
       'Stager'      => {'Payload' => ''}
     ))
   end

modules/payloads/stagers/android/reverse_tcp.rb

@@ -3,40 +3,29 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'metasploit-payloads'
 require 'msf/core'
 require 'msf/core/handler/reverse_tcp'
-require 'msf/core/payload/transport_config'
-require 'msf/base/sessions/command_shell'
-require 'msf/base/sessions/command_shell_options'
+require 'msf/core/payload/android/reverse_tcp'
 
 module MetasploitModule
 
   CachedSize = :dynamic
 
   include Msf::Payload::Stager
-  include Msf::Payload::TransportConfig
   include Msf::Payload::Android
-  include Msf::Payload::UUID::Options
+  include Msf::Payload::Android::ReverseTcp
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'        => 'Android Reverse TCP Stager',
-      'Description' => 'Connect back stager',
-      'Author'      => ['timwr', 'OJ Reeves'],
-      'License'     => MSF_LICENSE,
-      'Platform'    => 'android',
-      'Arch'        => ARCH_DALVIK,
-      'Handler'     => Msf::Handler::ReverseTcp,
-      'Stager'      => {'Payload' => ''}
-    ))
+      'Name'          => 'Android Reverse TCP Stager',
+      'Description'   => 'Connect back stager',
+      'Author'        => ['mihi', 'egypt'],
+      'License'       => MSF_LICENSE,
+      'Platform'      => 'android',
+      'Arch'          => ARCH_DALVIK,
+      'Handler'       => Msf::Handler::ReverseTcp,
+      'Convention'    => 'javasocket',
+      'Stager'        => {'Payload' => ''}
+      ))
   end
-
-  #
-  # Generate the transport-specific configuration
-  #
-  def transport_config(opts={})
-    transport_config_reverse_tcp(opts)
-  end
-
 end

modules/payloads/stagers/java/reverse_tcp.rb

@@ -17,15 +17,15 @@ module MetasploitModule
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'          => 'Java Reverse TCP Stager',
-      'Description'   => 'Connect back stager',
-      'Author'        => ['mihi', 'egypt'],
-      'License'       => MSF_LICENSE,
-      'Platform'      => 'java',
-      'Arch'          => ARCH_JAVA,
-      'Handler'       => Msf::Handler::ReverseTcp,
-      'Convention'    => 'javasocket',
-      'Stager'        => {'Payload' => ''}
-      ))
+      'Name'        => 'Java Reverse TCP Stager',
+      'Description' => 'Connect back stager',
+      'Author'      => ['mihi', 'egypt'],
+      'License'     => MSF_LICENSE,
+      'Platform'    => 'java',
+      'Arch'        => ARCH_JAVA,
+      'Handler'     => Msf::Handler::ReverseTcp,
+      'Convention'  => 'javasocket',
+      'Stager'      => {'Payload' => ''}
+    ))
   end
 end

modules/payloads/stages/android/meterpreter.rb

@@ -8,7 +8,7 @@ require 'msf/core/payload/android'
 require 'msf/core/payload/android/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_android'
 require 'msf/base/sessions/meterpreter_options'
-require 'rex/payloads/meterpreter/config'
+
 
 module MetasploitModule
 
@@ -18,8 +18,8 @@ module MetasploitModule
   def initialize(info = {})
     super(update_info(info,
       'Name'          => 'Android Meterpreter',
-      'Description'   => 'Run a meterpreter server on Android',
-      'Author'        => ['mihi', 'egypt', 'anwarelmakrahy', 'OJ Reeves'],
+      'Description'   => 'Run a meterpreter server in Android',
+      'Author'        => ['mihi', 'egypt', 'OJ Reeves'],
       'Platform'      => 'android',
       'Arch'          => ARCH_DALVIK,
       'PayloadCompat' => {'Convention' => 'javasocket javaurl'},