Fix bug with creating session_events

Author: jbarnett-r7

lib/metasploit/framework/data_service/proxy/session_event_data_proxy.rb

@@ -12,40 +12,6 @@ def session_events
   def report_session_event(opts)
     begin
       data_service = self.get_data_service()
-
-      # TODO: This is pretty hacky, but I don't want to change the code in Msf::DBManager::SessionEvent at this time.
-      # If we decide it's ok to make changes in that code then we need to make it simply store the object and
-      # do the pre-processing here.
-      if !data_service.is_a?(Msf::DBManager)
-        # The Msf::DBManager::SessionEvent.report_session_event does a lot of work for creating the SessionEvent
-        # Should we move that here?
-        #opts[:session] = opts[:session].sid
-        if opts[:session].respond_to? :db_record
-          session = opts[:session].db_record
-          if session.nil?
-            # The session doesn't have a db_record which means
-            #  a) the database wasn't connected at session registration time
-            # or
-            #  b) something awful happened and the report_session call failed
-            #
-            # Either way, we can't do anything with this session as is, so
-            # log a warning and punt.
-            wlog("Warning: trying to report a session_event for a session with no db_record (#{opts[:session].sid})")
-            return
-          end
-          event_data = { :created_at => Time.now }
-        else
-          session = opts[:session]
-          event_data = { :created_at => opts[:created_at] }
-        end
-
-        event_data[:session_id] = session.id
-        [:remote_path, :local_path, :output, :command, :etype].each do |attr|
-          event_data[attr] = opts[attr] if opts[attr]
-        end
-        opts = event_data
-      end
-
       data_service.report_session_event(opts)
     rescue Exception => e
       puts "Call to #{data_service.class}#report_session_event threw exception: #{e.message}"

lib/metasploit/framework/data_service/remote/http/remote_session_data_service.rb

@@ -17,10 +17,6 @@ def report_session(opts)
     session.db_record = sess_db
   end
 
-  # def get_session(opts = {})
-  #   json_to_open_struct_object(self.get_data(SESSION_API_PATH, opts), [])
-  # end
-
   #######
   private
   #######

lib/metasploit/framework/data_service/remote/http/remote_session_event_data_service.rb

@@ -10,6 +10,7 @@ def session_events(opts = {})
   end
 
   def report_session_event(opts)
+    opts[:session] = opts[:session].db_record
     self.post_data_async(SESSION_EVENT_PATH, opts)
   end
 end

lib/msf/core/db_manager/http/servlet/session_event_servlet.rb

@@ -27,7 +27,9 @@ def self.get_session_event
 
   def self.report_session_event
     lambda {
-      job = lambda { |opts| get_db().report_session_event(opts) }
+      job = lambda { |opts|
+        opts[:session] = open_struct(opts[:session][:table])
+        get_db().report_session_event(opts) }
       exec_report_job(request, &job)
     }
   end

lib/msf/core/db_manager/http/servlet_helper.rb

@@ -1,8 +1,10 @@
 require 'json'
 require 'msf/core/db_manager/http/db_manager_proxy'
 require 'msf/core/db_manager/http/job_processor'
+require 'metasploit/framework/data_service/remote/http/response_data_helper'
 
 module ServletHelper
+  include ResponseDataHelper
 
   def set_error_on_response(error)
     puts "Error handling request: #{error.message}"