Added session data export

Author: clee-r7

lib/metasploit/framework/data_service.rb

@@ -5,6 +5,8 @@
 require 'metasploit/framework/data_service/stubs/note_data_service'
 require 'metasploit/framework/data_service/stubs/web_data_service'
 require 'metasploit/framework/data_service/stubs/service_data_service'
+require 'metasploit/framework/data_service/stubs/session_data_service'
+require 'metasploit/framework/data_service/stubs/exploit_data_service'
 
 #
 # All data service implementations should include this module to ensure proper implementation
@@ -19,6 +21,8 @@ module DataService
   include WebDataService
   include NoteDataService
   include ServiceDataService
+  include SessionDataService
+  include ExploitDataService
 
   def name
     raise 'DataLService#name is not implemented';

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

@@ -10,11 +10,15 @@ module DataProxyAutoLoader
   autoload :WebDataProxy, 'metasploit/framework/data_service/proxy/web_data_proxy'
   autoload :WebDataProxy, 'metasploit/framework/data_service/proxy/web_data_proxy'
   autoload :ServiceDataProxy, 'metasploit/framework/data_service/proxy/service_data_proxy'
+  autoload :SessionDataProxy, 'metasploit/framework/data_service/proxy/session_data_proxy'
+  autoload :ExploitDataProxy, 'metasploit/framework/data_service/proxy/exploit_data_proxy'
   include ServiceDataProxy
   include HostDataProxy
   include VulnDataProxy
   include EventDataProxy
   include WorkspaceDataProxy
   include NoteDataProxy
   include WebDataProxy
+  include SessionDataProxy
+  include ExploitDataProxy
 end

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

@@ -0,0 +1,29 @@
+module ExploitDataProxy
+
+  def report_exploit_attempt(host, opts)
+    begin
+      data_service = self.get_data_service()
+      data_service.report_exploit_attempt(host, opts)
+    rescue  Exception => e
+      puts"Call to  #{data_service.class}#report_exploit_attempt threw exception: #{e.message}"
+    end
+  end
+
+  def report_exploit_failure(opts)
+    begin
+      data_service = self.get_data_service()
+      data_service.report_exploit_failure(opts)
+    rescue  Exception => e
+      puts"Call to  #{data_service.class}#report_exploit_failure threw exception: #{e.message}"
+    end
+  end
+
+  def report_exploit_success(opts)
+    begin
+      data_service = self.get_data_service()
+      data_service.report_exploit_success(opts)
+    rescue  Exception => e
+      puts"Call to  #{data_service.class}#report_exploit_success threw exception: #{e.message}"
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module SessionDataProxy
+  def report_session(opts)
+    begin
+      data_service = self.get_data_service()
+      data_service.report_session(opts)
+    rescue  Exception => e
+      puts"Call to  #{data_service.class}#report_session threw exception: #{e.message}"
+    end
+  end
+end

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

@@ -53,4 +53,14 @@ def workspaces
       puts"Call to  #{data_service.class}#workspaces threw exception: #{e.message}"
     end
   end
+
+  def workspace_associations_counts()
+    begin
+      data_service = self.get_data_service()
+      data_service.workspace_associations_counts()
+    rescue  Exception => e
+      puts"Call to  #{data_service.class}#workspace_associations_counts threw exception: #{e.message}"
+    end
+  end
+
 end

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

@@ -29,8 +29,8 @@ def initialize(endpoint)
   #
   # POST data and don't wait for the endpoint to process the data before getting a response
   #
-  def post_data_async(data_hash, path)
-    post_data(data_hash.merge(EXEC_ASYNC), path)
+  def post_data_async(path, data_hash)
+    post_data(path, data_hash.merge(EXEC_ASYNC))
   end
 
   #
@@ -41,7 +41,7 @@ def post_data_async(data_hash, path)
   #
   # @return A wrapped response (ResponseWrapper), see below.
   #
-  def post_data(data_hash, path)
+  def post_data(path, data_hash)
     begin
       raise 'Data to post to remote service cannot be null or empty' if (data_hash.nil? or data_hash.empty?)
 
@@ -57,6 +57,8 @@ def post_data(data_hash, path)
         puts "POST request: #{path} with body: #{json_body} failed with code: #{response.code} message: #{response.body}"
         return FailedResponse.new(response)
       end
+    rescue Exception => e
+      puts "Problem with POST request: #{e.message}"
     ensure
       @client_pool << client
     end
@@ -65,12 +67,12 @@ def post_data(data_hash, path)
   #
   # GET data from the HTTP endpoint
   #
-  # @param data_hash - A hash representation of the object to be posted. Cann be nil or empty.
   # @param path - The URI path to post to
+  # @param data_hash - A hash representation of the object to be posted. Can be nil or empty.
   #
   # @return A wrapped response (ResponseWrapper), see below.
   #
-  def get_data(data_hash, path)
+  def get_data(path, data_hash = nil)
     begin
       client =  @client_pool.pop()
       request_opts = build_request_opts(GET_REQUEST, data_hash, path)
@@ -84,6 +86,8 @@ def get_data(data_hash, path)
         puts "GET request: #{path} failed with code: #{response.code} message: #{response.body}"
         return FailedResponse.new(response)
       end
+    rescue Exception => e
+        puts "Problem with GET request: #{e.message}"
     ensure
       @client_pool << client
     end
@@ -184,7 +188,7 @@ def append_workspace(data_hash)
       workspace = data_hash.delete(:wspace)
     end
 
-    if (workspace and workspace.is_a?(OpenStruct))
+    if (workspace and (workspace.is_a?(OpenStruct) or workspace.is_a?(::Mdm::Workspace)))
       data_hash['workspace'] = workspace.name
     end
 

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

@@ -9,11 +9,15 @@ module DataServiceAutoLoader
   autoload :RemoteVulnDataService, 'metasploit/framework/data_service/remote/http/remote_vuln_data_service'
   autoload :RemoteWebDataService, 'metasploit/framework/data_service/remote/http/remote_web_data_service'
   autoload :RemoteServiceDataService, 'metasploit/framework/data_service/remote/http/remote_service_data_service'
+  autoload :RemoteSessionDataService, 'metasploit/framework/data_service/remote/http/remote_session_data_service'
+  autoload :RemoteExploitDataService, 'metasploit/framework/data_service/remote/http/remote_exploit_data_service'
   include RemoteHostDataService
   include RemoteEventDataService
   include RemoteNoteDataService
   include RemoteWorkspaceDataService
   include RemoteVulnDataService
   include RemoteWebDataService
   include RemoteServiceDataService
+  include RemoteSessionDataService
+  include RemoteExploitDataService
 end

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

@@ -2,6 +2,6 @@ module RemoteEventDataService
   EVENT_API_PATH = '/api/1/msf/event'
 
   def report_event(opts)
-    self.post_data_async(opts, EVENT_API_PATH)
+    self.post_data_async(EVENT_API_PATH, opts)
   end
 end

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

@@ -0,0 +1,20 @@
+module RemoteExploitDataService
+  EXPLOIT_API_PATH = '/api/1/msf/exploit'
+
+  def report_exploit_attempt(host, opts)
+    opts[:host] = host
+    opts[:exploit_report_type] = "attempt"
+    self.post_data_async(EXPLOIT_API_PATH, opts)
+  end
+
+  def report_exploit_failure(opts)
+    opts[:exploit_report_type] = "failure"
+    self.post_data_async(EXPLOIT_API_PATH, opts)
+  end
+
+  def report_exploit_success(opts)
+    opts[:exploit_report_type] = "success"
+    self.post_data_async(EXPLOIT_API_PATH, opts)
+  end
+
+end

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

@@ -7,23 +7,23 @@ module RemoteHostDataService
   HOST_SEARCH_PATH = HOST_PATH + "/search"
 
   def hosts(opts)
-    json_to_open_struct_object(self.get_data(opts, HOST_PATH), [])
+    json_to_open_struct_object(self.get_data(HOST_PATH, opts), [])
   end
 
   def report_host(opts)
-    self.post_data_async(opts, HOST_PATH)
+    self.post_data_async(HOST_PATH, opts)
   end
 
   def find_or_create_host(opts)
-    json_to_open_struct_object(self.post_data(host, HOST_PATH))
+    json_to_open_struct_object(self.post_data(HOST_PATH, host))
   end
 
   def report_hosts(hosts)
-    self.post_data(hosts, HOST_PATH)
+    self.post_data(HOST_PATH, hosts)
   end
 
   def do_host_search(search)
-    response = self.post_data(search, HOST_SEARCH_PATH)
+    response = self.post_data(HOST_SEARCH_PATH, search)
     return response.body
   end
 end