From 884760f11d354c47cdabc9015a65ce125e361faf Mon Sep 17 00:00:00 2001
From: OJ <oj@buffered.io>
Date: Tue, 18 Aug 2015 17:27:48 +1000
Subject: [PATCH] Update the output format for the Wifi collection

---
 .../meterpreter/extensions/android/android.rb | 33 ++++++++++-------
 .../ui/console/command_dispatcher/android.rb  | 35 ++++++++++---------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/lib/rex/post/meterpreter/extensions/android/android.rb b/lib/rex/post/meterpreter/extensions/android/android.rb
index 750e1b5cf6..62f66cdc4a 100644
--- a/lib/rex/post/meterpreter/extensions/android/android.rb
+++ b/lib/rex/post/meterpreter/extensions/android/android.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+#
 # -*- coding: binary -*-
 require 'rex/post/meterpreter/extensions/android/tlv'
 require 'rex/post/meterpreter/packet'
@@ -10,10 +11,12 @@ module Post
 module Meterpreter
 module Extensions
 module Android
+
 ###
 # Android extension - set of commands to be executed on android devices.
 # extension by Anwar Mohamed (@anwarelmakrahy)
 ###
+
 class Android < Extension
 
   COLLECT_TYPE_WIFI = 1
@@ -79,22 +82,28 @@ class Android < Extension
 
     case COLLECT_TYPES[opts[:type]]
     when COLLECT_TYPE_WIFI
-      result[:headers] = ['BSSID', 'SSID', 'Level']
+      result[:headers] = ['Last Seen', 'BSSID', 'SSID', 'Level']
+      result[:entries] = []
+      records = {}
+
       response.each(TLV_TYPE_COLLECT_RESULT_GROUP) do |g|
-        collection = {
-          timestamp: g.get_tlv_value(TLV_TYPE_COLLECT_RESULT_TIMESTAMP),
-          entries:   []
-        }
+        timestamp = g.get_tlv_value(TLV_TYPE_COLLECT_RESULT_TIMESTAMP)
+        timestamp = Time.at(timestamp).to_datetime.strftime('%Y-%m-%d %H:%M:%S')
 
         g.each(TLV_TYPE_COLLECT_RESULT_WIFI) do |w|
-          collection[:entries] << [
-            w.get_tlv_value(TLV_TYPE_COLLECT_RESULT_WIFI_BSSID),
-            w.get_tlv_value(TLV_TYPE_COLLECT_RESULT_WIFI_SSID),
-            0x100000000 - w.get_tlv_value(TLV_TYPE_COLLECT_RESULT_WIFI_LEVEL)
-          ]
-        end
+          bssid = w.get_tlv_value(TLV_TYPE_COLLECT_RESULT_WIFI_BSSID)
+          ssid = w.get_tlv_value(TLV_TYPE_COLLECT_RESULT_WIFI_SSID)
+          key = "#{bssid}-#{ssid}"
 
-        result[:collections] << collection
+          if !records.include?(key) || records[key][0] < timestamp
+            level = 0x100000000 - w.get_tlv_value(TLV_TYPE_COLLECT_RESULT_WIFI_LEVEL)
+            records[key] = [timestamp, bssid, ssid, level]
+          end
+        end
+      end
+
+      records.each do |k, v|
+        result[:entries] << v
       end
     end
 
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb
index 4160666e4f..8030c3329c 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb
@@ -96,25 +96,28 @@ class Console::CommandDispatcher::Android
         return
       end
 
-
       result = client.android.interval_collect(opts)
-      if result[:headers].length > 0 && result[:collections].length > 0
-        result[:collections].each do |c|
-          time = Time.at(c[:timestamp]).to_datetime
-          table = Rex::Ui::Text::Table.new(
-            'Header'    => "Captured #{opts[:type]} data at #{time.strftime('%Y-%m-%d %H:%M:%S')}",
-            'SortIndex' => -1,
-            'Columns'   => result[:headers],
-            'Indent'    => 0
-          )
+      if result[:headers].length > 0 && result[:entries].length > 0
+        header = "Captured #{opts[:type]} data"
 
-          c[:entries].each do |e|
-            table << e
-          end
-
-          print_line
-          print_line(table.to_s)
+        if result[:timestamp]
+          time = Time.at(result[:timestamp]).to_datetime
+          header << " at #{time.strftime('%Y-%m-%d %H:%M:%S')}"
         end
+
+        table = Rex::Ui::Text::Table.new(
+          'Header'    => header,
+          'SortIndex' => 0,
+          'Columns'   => result[:headers],
+          'Indent'    => 0
+        )
+
+        result[:entries].each do |e|
+          table << e
+        end
+
+        print_line
+        print_line(table.to_s)
       else
         print_good('Interval action completed successfully')
       end