Land rapid7#7447, unify Android meterpreter method names, add missing stageless class

Author: Brent Cook

Gemfile.lock

@@ -14,7 +14,7 @@ PATH
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 1.1.23)
+      metasploit-payloads (= 1.1.24)
       metasploit_data_models
       metasploit_payloads-mettle (= 0.0.8)
       msgpack
@@ -167,7 +167,7 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-payloads (1.1.23)
+    metasploit-payloads (1.1.24)
     metasploit_data_models (2.0.4)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -185,7 +185,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.9.1)
-    msgpack (1.0.0)
+    msgpack (1.0.1)
     multi_json (1.12.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)

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

@@ -66,20 +66,20 @@ def collect_types
   end
 
   def device_shutdown(n)
-    request = Packet.create_request('device_shutdown')
+    request = Packet.create_request('android_device_shutdown')
     request.add_tlv(TLV_TYPE_SHUTDOWN_TIMER, n)
     response = client.send_request(request)
     response.get_tlv(TLV_TYPE_SHUTDOWN_OK).value
   end
 
   def set_audio_mode(n)
-    request = Packet.create_request('set_audio_mode')
+    request = Packet.create_request('android_set_audio_mode')
     request.add_tlv(TLV_TYPE_AUDIO_MODE, n)
     response = client.send_request(request)
   end
 
   def interval_collect(opts)
-    request = Packet.create_request('interval_collect')
+    request = Packet.create_request('android_interval_collect')
     request.add_tlv(TLV_TYPE_COLLECT_ACTION, COLLECT_ACTIONS[opts[:action]])
     request.add_tlv(TLV_TYPE_COLLECT_TYPE, COLLECT_TYPES[opts[:type]])
     request.add_tlv(TLV_TYPE_COLLECT_TIMEOUT, opts[:timeout])
@@ -182,7 +182,7 @@ def interval_collect(opts)
 
   def dump_sms
     sms = []
-    request = Packet.create_request('dump_sms')
+    request = Packet.create_request('android_dump_sms')
     response = client.send_request(request)
 
     response.each(TLV_TYPE_SMS_GROUP) do |p|
@@ -199,7 +199,7 @@ def dump_sms
 
   def dump_contacts
     contacts = []
-    request = Packet.create_request('dump_contacts')
+    request = Packet.create_request('android_dump_contacts')
     response = client.send_request(request)
 
     response.each(TLV_TYPE_CONTACT_GROUP) do |p|
@@ -214,7 +214,7 @@ def dump_contacts
 
   def geolocate
     loc = []
-    request = Packet.create_request('geolocate')
+    request = Packet.create_request('android_geolocate')
     response = client.send_request(request)
 
     loc << {
@@ -227,7 +227,7 @@ def geolocate
 
   def dump_calllog
     log = []
-    request = Packet.create_request('dump_calllog')
+    request = Packet.create_request('android_dump_calllog')
     response = client.send_request(request)
 
     response.each(TLV_TYPE_CALLLOG_GROUP) do |p|
@@ -243,13 +243,13 @@ def dump_calllog
   end
 
   def check_root
-    request = Packet.create_request('check_root')
+    request = Packet.create_request('android_check_root')
     response = client.send_request(request)
     response.get_tlv(TLV_TYPE_CHECK_ROOT_BOOL).value
   end
 
   def activity_start(uri)
-    request = Packet.create_request('activity_start')
+    request = Packet.create_request('android_activity_start')
     request.add_tlv(TLV_TYPE_URI_STRING, uri)
     response = client.send_request(request)
     if response.get_tlv(TLV_TYPE_ACTIVITY_START_RESULT).value
@@ -260,13 +260,13 @@ def activity_start(uri)
   end
 
   def set_wallpaper(data)
-    request = Packet.create_request('set_wallpaper')
+    request = Packet.create_request('android_set_wallpaper')
     request.add_tlv(TLV_TYPE_WALLPAPER_DATA, data)
     response = client.send_request(request)
   end
 
   def send_sms(dest, body, dr)
-    request = Packet.create_request('send_sms')
+    request = Packet.create_request('android_android_send_sms')
     request.add_tlv(TLV_TYPE_SMS_ADDRESS, dest)
     request.add_tlv(TLV_TYPE_SMS_BODY, body)
     request.add_tlv(TLV_TYPE_SMS_DR, dr)
@@ -283,7 +283,7 @@ def send_sms(dest, body, dr)
   end
 
   def wlan_geolocate
-    request = Packet.create_request('wlan_geolocate')
+    request = Packet.create_request('android_wlan_geolocate')
     response = client.send_request(request, 30)
     networks = []
     response.each(TLV_TYPE_WLAN_GROUP) do |p|
@@ -297,7 +297,7 @@ def wlan_geolocate
   end
 
   def sqlite_query(dbname, query, writeable)
-    request = Packet.create_request('sqlite_query')
+    request = Packet.create_request('android_sqlite_query')
     request.add_tlv(TLV_TYPE_SQLITE_NAME, dbname)
     request.add_tlv(TLV_TYPE_SQLITE_QUERY, query)
     request.add_tlv(TLV_TYPE_SQLITE_WRITE, writeable)

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

@@ -36,18 +36,18 @@ def commands
     }
 
     reqs = {
-      'dump_sms'         => ['dump_sms'],
-      'dump_contacts'    => ['dump_contacts'],
-      'geolocate'        => ['geolocate'],
-      'dump_calllog'     => ['dump_calllog'],
-      'check_root'       => ['check_root'],
-      'device_shutdown'  => ['device_shutdown'],
-      'send_sms'         => ['send_sms'],
-      'wlan_geolocate'   => ['wlan_geolocate'],
-      'interval_collect' => ['interval_collect'],
-      'activity_start'   => ['activity_start'],
-      'sqlite_query'     => ['sqlite_query'],
-      'set_audio_mode'   => ['set_audio_mode']
+      'dump_sms'         => ['android_dump_sms'],
+      'dump_contacts'    => ['android_dump_contacts'],
+      'geolocate'        => ['android_geolocate'],
+      'dump_calllog'     => ['android_dump_calllog'],
+      'check_root'       => ['android_check_root'],
+      'device_shutdown'  => ['android_device_shutdown'],
+      'send_sms'         => ['android_send_sms'],
+      'wlan_geolocate'   => ['android_wlan_geolocate'],
+      'interval_collect' => ['android_interval_collect'],
+      'activity_start'   => ['android_activity_start'],
+      'sqlite_query'     => ['android_sqlite_query'],
+      'set_audio_mode'   => ['android_set_audio_mode']
     }
 
     # Ensure any requirements of the command are met

metasploit-framework.gemspec

@@ -65,7 +65,7 @@ Gem::Specification.new do |spec|
   # are needed when there's no database
   spec.add_runtime_dependency 'metasploit-model'
   # Needed for Meterpreter
-  spec.add_runtime_dependency 'metasploit-payloads', '1.1.23'
+  spec.add_runtime_dependency 'metasploit-payloads', '1.1.24'
   # Needed for the next-generation POSIX Meterpreter
   spec.add_runtime_dependency 'metasploit_payloads-mettle', '0.0.8'
   # Needed by msfgui and other rpc components