Track and display the last checkin time for Meterpreter sessions

Author: HD Moore

lib/msf/base/serializer/readable_text.rb

@@ -536,6 +536,7 @@ def self.dump_sessions(framework, opts={})
       ]
 
     columns << 'Via' if verbose
+    columns << 'CheckIn' if verbose
     columns << 'PayloadId' if verbose
 
     tbl = Rex::Ui::Text::Table.new(
@@ -554,11 +555,16 @@ def self.dump_sessions(framework, opts={})
 
       row = [ session.sid.to_s, session.type.to_s, sinfo, session.tunnel_to_s + " (#{session.session_host})" ]
       if session.respond_to? :platform
-        row[1] += " " + session.platform
+        row[1] << (" " + session.platform)
       end
 
       if verbose
         row << session.via_exploit.to_s
+        if session.respond_to?(:last_checkin) && session.last_checkin
+          row << "#{(Time.now.to_i - session.last_checkin.to_i)}s"
+        else
+          row << ''
+        end
         row << session.payload_uuid.to_s
       end
 

lib/rex/post/meterpreter/client.rb

@@ -464,6 +464,10 @@ def unicode_filter_decode(str)
   # A list of the commands
   #
   attr_reader :commands
+  #
+  # The timestamp of the last received response
+  #
+  attr_accessor :last_checkin
 
 protected
   attr_accessor :parser, :ext_aliases # :nodoc:

lib/rex/post/meterpreter/packet_dispatcher.rb

@@ -79,7 +79,11 @@ def initialize_passive_dispatcher
 
   def shutdown_passive_dispatcher
     return if not self.passive_service
-    self.passive_service.remove_resource(self.conn_id  + "/")
+
+    # Ensure that there is only one leading and trailing slash on the URI
+    resource_uri = "/" + self.conn_id.to_s.gsub(/(^\/|\/$)/, '') + "/"
+
+    self.passive_service.remove_resource(resource_uri)
 
     # If there are no more resources registered on the service, stop it entirely
     if self.passive_service.resources.empty?
@@ -102,6 +106,8 @@ def on_passive_request(cli, req)
     resp['Content-Type'] = 'application/octet-stream'
     resp['Connection']   = 'close'
 
+    self.last_checkin = Time.now
+
     # If the first 4 bytes are "RECV", return the oldest packet from the outbound queue
     if req.body[0,4] == "RECV"
       rpkt = send_queue.shift
@@ -494,6 +500,9 @@ def dispatch_inbound_packet(packet, client = nil)
       client = self
     end
 
+    # Update our last reply time
+    client.last_checkin = Time.now
+
     # If the packet is a response, try to notify any potential
     # waiters
     if ((resp = packet.response?))