Merge branch 'android_ext2' of github.com:AnwarMohamed/metasploit-framework into anwar-android-bins

Author: joevennix

lib/msf/base/sessions/meterpreter_android.rb

@@ -1,6 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/base/sessions/meterpreter'
+require 'msf/base/sessions/meterpreter_java'
 require 'msf/base/sessions/meterpreter_options'
 
 module Msf

lib/msf/base/sessions/meterpreter_java.rb

@@ -11,7 +11,6 @@ module Sessions
 #
 ###
 class Meterpreter_Java_Java < Msf::Sessions::Meterpreter
-
   def supports_ssl?
     false
   end

lib/msf/base/sessions/meterpreter_options.rb

@@ -59,6 +59,12 @@ def on_session(session)
       end
     end
 
+    if session.platform =~ /android/i
+      if (datastore['AutoLoadAndroid'])
+        session.load_android
+      end
+    end
+
     [ 'InitialAutoRunScript', 'AutoRunScript' ].each do |key|
       if (datastore[key].empty? == false)
         args = Shellwords.shellwords( datastore[key] )

lib/rex/post/meterpreter/extensions/android/android.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 # -*- coding: binary -*-
-
 require 'rex/post/meterpreter/extensions/android/tlv'
 require 'rex/post/meterpreter/packet'
 require 'rex/post/meterpreter/client'
@@ -120,7 +119,6 @@ def check_root
     response = client.send_request(request)
     response.get_tlv(TLV_TYPE_CHECK_ROOT_BOOL).value
   end
-  
 end
 
 end

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

@@ -1,6 +1,6 @@
 # -*- coding: binary -*-
-require 'msf/core'
 require 'rex/post/meterpreter'
+require 'msf/core/auxiliary/report'
 
 module Rex
 module Post
@@ -15,9 +15,9 @@ module Ui
 class Console::CommandDispatcher::Android
   include Console::CommandDispatcher
   include Msf::Auxiliary::Report
-
-  def initialize(shell)
-    super
+ 
+  def framework
+    client.framework
   end
 
   #

modules/payloads/stages/android/meterpreter.rb

@@ -14,17 +14,17 @@ module Metasploit3
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'			=> 'Android Meterpreter',
-      'Description'	=> 'Run a meterpreter server on Android',
-      'Author'		=> [
+      'Name'      => 'Android Meterpreter',
+      'Description' => 'Run a meterpreter server on Android',
+      'Author'    => [
           'mihi', # all the hard work
           'egypt', # msf integration
           'anwarelmakrahy' # android extension
         ],
-      'Platform'		=> 'android',
-      'Arch'			=> ARCH_DALVIK,
-      'License'		=> MSF_LICENSE,
-      'Session'		=> Msf::Sessions::Meterpreter_Java_Android))
+      'Platform'    => 'android',
+      'Arch'      => ARCH_DALVIK,
+      'License'   => MSF_LICENSE,
+      'Session'   => Msf::Sessions::Meterpreter_Java_Android))
 
     register_options(
     [
@@ -48,13 +48,4 @@ def generate_stage
     # it from, and then finally the meterpreter stage
     java_string(clazz) + java_string(metstage) + java_string(met)
   end
-
-  def on_session(session)
-    super
-    framework.sessions.schedule Proc.new {
-      if (datastore['AutoLoadAndroid'])
-        session.load_android
-      end
-    }
-  end
 end