Merge branch 'goliath' of github.com:clee-r7/metasploit-framework into goliath

jbarnett-r7 · jbarnett-r7 · commit d4440d049db5 · 2018-02-21T11:16:31.000-06:00
diff --git a/lib/metasploit/framework/data_service/proxy/core.rb b/lib/metasploit/framework/data_service/proxy/core.rb
@@ -115,6 +115,14 @@ def get_data_service
     return @current_data_service
   end
 
+  def log_error(exception, ui_message)
+    elog "#{ui_message}: #{exception.message}"
+    exception.backtrace.each { |line| elog "#{line}" }
+    # TODO: We should try to surface the original exception, instead of just a generic one.
+    # This should not display the full backtrace, only the message.
+    raise Exception, "#{ui_message}: #{exception.message}. See log for more details."
+  end
+
   #######
   private
   #######
diff --git a/lib/metasploit/framework/data_service/proxy/credential_data_proxy.rb b/lib/metasploit/framework/data_service/proxy/credential_data_proxy.rb
@@ -5,7 +5,7 @@ def create_credential(opts)
       data_service = self.get_data_service()
       data_service.create_credential(opts)
     rescue Exception => e
-      elog "Problem creating credential: #{e.message}"
+      self.log_error(e, "Problem creating credential")
     end
   end
 
@@ -14,7 +14,7 @@ def creds(opts = {})
       data_service = self.get_data_service
       data_service.creds(opts)
     rescue Exception => e
-      elog "Problem retrieving credentials: #{e.message}"
+      self.log_error(e, "Problem retrieving credentials")
     end
   end
 end
diff --git a/lib/metasploit/framework/data_service/proxy/event_data_proxy.rb b/lib/metasploit/framework/data_service/proxy/event_data_proxy.rb
@@ -5,7 +5,7 @@ def report_event(opts)
       data_service = self.get_data_service()
       data_service.report_event(opts)
     rescue  Exception => e
-      elog "Problem reporting event: #{e.message}"
+      self.log_error(e, "Problem reporting event")
     end
   end
 
diff --git a/lib/metasploit/framework/data_service/proxy/exploit_data_proxy.rb b/lib/metasploit/framework/data_service/proxy/exploit_data_proxy.rb
@@ -5,7 +5,7 @@ def report_exploit_attempt(host, opts)
       data_service = self.get_data_service()
       data_service.report_exploit_attempt(host, opts)
     rescue  Exception => e
-      elog "Problem reporting exploit attempt: #{e.message}"
+      self.log_error(e, "Problem reporting exploit attempt")
     end
   end
 
@@ -14,7 +14,7 @@ def report_exploit_failure(opts)
       data_service = self.get_data_service()
       data_service.report_exploit_failure(opts)
     rescue  Exception => e
-      elog "Problem reporting exploit failure: #{e.message}"
+      self.log_error(e, "Problem reporting exploit failure")
     end
   end
 
@@ -23,7 +23,7 @@ def report_exploit_success(opts)
       data_service = self.get_data_service()
       data_service.report_exploit_success(opts)
     rescue  Exception => e
-      elog "Problem reporting exploit success: #{e.message}"
+      self.log_error(e, "Problem reporting exploit success")
     end
   end
 end
diff --git a/lib/metasploit/framework/data_service/proxy/host_data_proxy.rb b/lib/metasploit/framework/data_service/proxy/host_data_proxy.rb
@@ -10,7 +10,7 @@ def hosts(wspace = workspace, non_dead = false, addresses = nil, search_term = n
       opts[:search_term] = search_term
       data_service.hosts(opts)
     rescue Exception => e
-      elog "Problem retrieving hosts: #{e.message}"
+      self.log_error(e, "Problem retrieving hosts")
     end
   end
 
@@ -27,7 +27,7 @@ def report_host(opts)
       data_service = self.get_data_service()
       data_service.report_host(opts)
     rescue Exception => e
-      elog "Problem reporting host: #{e.message}"
+      self.log_error(e, "Problem reporting host")
     end
   end
 
@@ -36,7 +36,7 @@ def report_hosts(hosts)
       data_service = self.get_data_service()
       data_service.report_hosts(hosts)
     rescue Exception => e
-      elog "Problem reporting hosts: #{e.message}"
+      self.log_error(e, "Problem reporting hosts")
     end
   end
 
@@ -45,7 +45,7 @@ def update_host(opts)
       data_service = self.get_data_service()
       data_service.update_host(opts)
     rescue Exception => e
-      elog "Problem updating host: #{e.message}"
+      self.log_error(e, "Problem updating host")
     end
   end
 
@@ -54,7 +54,7 @@ def delete_host(opts)
       data_service = self.get_data_service()
       data_service.delete_host(opts)
     rescue Exception => e
-      elog "Problem removing host: #{e.message}"
+      self.log_error(e, "Problem deleting host")
     end
   end
 
diff --git a/lib/metasploit/framework/data_service/proxy/loot_data_proxy.rb b/lib/metasploit/framework/data_service/proxy/loot_data_proxy.rb
@@ -8,19 +8,34 @@ def report_loot(opts)
       end
       data_service.report_loot(opts)
     rescue Exception => e
-      elog "Problem reporting loot: #{e.message}"
+      self.log_error(e, "Problem reporting loot")
     end
   end
 
+  # TODO: Shouldn't this proxy to RemoteLootDataService#find_or_create_loot ?
+  # It's currently skipping the "find" part
+  def find_or_create_loot(opts)
+    report_loot(opts)
+  end
+
   def loots(wspace, opts = {})
     begin
       data_service = self.get_data_service
       opts[:wspace] = wspace
       data_service.loot(opts)
     rescue Exception => e
-      elog "Problem retrieving loot: #{e.message}"
+      self.log_error(e, "Problem retrieving loot")
     end
   end
 
   alias_method :loot, :loots
+
+  def update_loot(opts)
+    begin
+      data_service = self.get_data_service
+      data_service.update_loot(opts)
+    rescue Exception => e
+      self.log_error(e, "Problem updating loot")
+    end
+  end
 end
diff --git a/lib/metasploit/framework/data_service/proxy/nmap_data_proxy.rb b/lib/metasploit/framework/data_service/proxy/nmap_data_proxy.rb
@@ -5,7 +5,7 @@ def import_nmap_xml_file(args = {})
       data_service = self.get_data_service()
       data_service.import_nmap_xml_file(args)
     rescue Exception => e
-      elog "Problem importing NMAP XML: #{e.message}"
+      self.log_error(e, "Problem importing Nmap XML file")
     end
   end
 end
diff --git a/lib/metasploit/framework/data_service/proxy/note_data_proxy.rb b/lib/metasploit/framework/data_service/proxy/note_data_proxy.rb
@@ -4,7 +4,7 @@ def report_note(opts)
       data_service = self.get_data_service()
       data_service.report_note(opts)
     rescue  Exception => e
-      elog "Problem reporting note: #{e.message}"
+      self.log_error(e, "Problem reporting note")
     end
   end
 end
diff --git a/lib/metasploit/framework/data_service/proxy/service_data_proxy.rb b/lib/metasploit/framework/data_service/proxy/service_data_proxy.rb
@@ -5,7 +5,7 @@ def report_service(opts)
       data_service = self.get_data_service()
       data_service.report_service(opts)
     rescue  Exception => e
-      elog "Problem reporting service: #{e.message}"
+      self.log_error(e, "Problem reporting service")
     end
   end
 
diff --git a/lib/metasploit/framework/data_service/proxy/session_data_proxy.rb b/lib/metasploit/framework/data_service/proxy/session_data_proxy.rb
@@ -4,7 +4,7 @@ def report_session(opts)
       data_service = self.get_data_service()
       data_service.report_session(opts)
     rescue  Exception => e
-      elog "Problem reporting session: #{e.message}"
+      self.log_error(e, "Problem reporting session")
     end
   end
 end
diff --git a/lib/metasploit/framework/data_service/proxy/session_event_data_proxy.rb b/lib/metasploit/framework/data_service/proxy/session_event_data_proxy.rb
@@ -5,7 +5,7 @@ def report_session_event(opts)
       data_service = self.get_data_service()
       data_service.report_session_event(opts)
     rescue Exception => e
-      elog "Problem reporting session event: #{e.message}"
+      self.log_error(e, "Problem reporting session event")
     end
   end
 end
diff --git a/lib/metasploit/framework/data_service/proxy/vuln_data_proxy.rb b/lib/metasploit/framework/data_service/proxy/vuln_data_proxy.rb
@@ -5,7 +5,7 @@ def report_vuln(opts)
       data_service = self.get_data_service()
       data_service.report_vuln(opts)
     rescue  Exception => e
-      elog "Problem reporting vulnerability: #{e.message}"
+      self.log_error(e, "Problem reporting vuln")
     end
   end
 
diff --git a/lib/metasploit/framework/data_service/proxy/web_data_proxy.rb b/lib/metasploit/framework/data_service/proxy/web_data_proxy.rb
@@ -4,7 +4,7 @@ def report_web_site(opts)
       data_service = self.get_data_service()
       data_service.report_web_site(opts)
     rescue  Exception => e
-      elog "Problem reporting web site: #{e.message}"
+      self.log_error(e, "Problem reporting website")
     end
   end
 end
diff --git a/lib/metasploit/framework/data_service/proxy/workspace_data_proxy.rb b/lib/metasploit/framework/data_service/proxy/workspace_data_proxy.rb
@@ -5,7 +5,7 @@ def find_workspace(workspace_name)
       data_service = self.get_data_service()
       data_service.find_workspace(workspace_name)
     rescue  Exception => e
-      elog "Problem finding workspace: #{e.message}"
+      self.log_error(e, "Problem finding workspace")
     end
   end
 
@@ -14,7 +14,7 @@ def add_workspace(workspace_name)
       data_service = self.get_data_service()
       data_service.add_workspace(workspace_name)
     rescue  Exception => e
-      elog "Problem adding workspace: #{e.message}"
+      self.log_error(e, "Problem adding workspace")
     end
   end
 
@@ -23,7 +23,7 @@ def default_workspace
       data_service = self.get_data_service()
       data_service.default_workspace
     rescue  Exception => e
-      elog "Problem getting the default workspace: #{e.message}"
+      self.log_error(e, "Problem finding default workspace")
     end
   end
 
@@ -32,7 +32,7 @@ def workspace
       data_service = self.get_data_service()
       data_service.workspace
     rescue  Exception => e
-      elog "Problem retrieving workspace: #{e.message}"
+      self.log_error(e, "Problem retrieving workspace")
     end
   end
 
@@ -41,7 +41,7 @@ def workspace=(workspace)
       data_service = self.get_data_service()
       data_service.workspace = workspace
     rescue  Exception => e
-      elog "Problem setting workspace: #{e.message}"
+      self.log_error(e, "Problem setting workspace")
     end
   end
 
@@ -50,7 +50,7 @@ def workspaces
       data_service = self.get_data_service()
       data_service.workspaces
     rescue  Exception => e
-      elog "Problem retrieving workspaces: #{e.message}"
+      self.log_error(e, "Problem retrieving workspaces")
     end
   end
 
@@ -59,7 +59,7 @@ def workspace_associations_counts()
       data_service = self.get_data_service()
       data_service.workspace_associations_counts()
     rescue  Exception => e
-      elog "Problem retrieving workspaces counts: #{e.message}"
+      self.log_error(e, "Problem retrieving workspace counts")
     end
   end
 
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_loot_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_loot_data_service.rb
@@ -8,7 +8,7 @@ module RemoteLootDataService
 
   def loot(opts = {})
     # TODO: Add an option to toggle whether the file data is returned or not
-    loots = json_to_mdm_object(self.get_data(LOOT_API_PATH, opts), LOOT_MDM_CLASS, [])
+    loots = json_to_mdm_object(self.get_data(LOOT_API_PATH, nil, opts), LOOT_MDM_CLASS, [])
     # Save a local copy of the file
     loots.each do |loot|
       if loot.data
@@ -30,4 +30,17 @@ def find_or_create_loot(opts)
   def report_loots(loot)
     self.post_data(LOOT_API_PATH, loot)
   end
+
+  def update_loot(opts)
+    path = LOOT_API_PATH
+    if opts && opts[:id]
+      id = opts.delete(:id)
+      path = "#{LOOT_API_PATH}/#{id}"
+    end
+    json_to_mdm_object(self.put_data(path, opts), LOOT_MDM_CLASS, [])
+  end
+
+  def delete_loot(opts)
+    json_to_mdm_object(self.delete_data(LOOT_API_PATH, opts), LOOT_MDM_CLASS, [])
+  end
 end
diff --git a/lib/metasploit/framework/data_service/remote/http/response_data_helper.rb b/lib/metasploit/framework/data_service/remote/http/response_data_helper.rb
@@ -45,6 +45,7 @@ def json_to_mdm_object(response_wrapper, mdm_class, returns_on_error = nil)
         end
       rescue Exception => e
         elog "Mdm Object conversion failed #{e.message}"
+        e.backtrace.each { |line| elog "#{line}\n" }
       end
     end
 
@@ -66,7 +67,8 @@ def process_file(base64_file, save_path)
         File.open(save_path, 'w+') { |file| file.write(decoded_file) }
       end
     rescue Exception => e
-      elog "There was an error writing the file: #{e.message}"
+      elog "There was an error writing the file: #{e}"
+      e.backtrace.each { |line| elog "#{line}\n"}
     end
     save_path
   end
diff --git a/lib/msf/core/db_manager/host.rb b/lib/msf/core/db_manager/host.rb
@@ -9,27 +9,17 @@ def del_host(wspace, address, comm='')
   }
   end
 
+  # Deletes Host entries based on the IDs passed in.
+  #
+  # @param opts[:ids] [Array] Array containing Integers corresponding to the IDs of the Loot entries to delete.
+  # @return [Array] Array containing the Mdm::Loot objects that were successfully deleted.
   def delete_host(opts)
-    wspace = opts[:workspace] || opts[:wspace] || workspace
-    if wspace.is_a? String
-      wspace = find_workspace(wspace)
-    end
+    raise ArgumentError.new("The following options are required: :ids") if opts[:ids].nil?
 
     ::ActiveRecord::Base.connection_pool.with_connection {
-      hosts = []
-      if opts[:address] || opts[:host]
-        opt_addr = opts[:address] || opts[:host]
-        host = wspace.hosts.find_by_address(opt_addr)
-        return { error: { message: "Unable to find host by specified address" } } if host.nil? || host.class != ::Mdm::Host
-        hosts << host
-      elsif opts[:addresses]
-        return { error: { message: "Unable to find host by specified addresses" } } if opts[:addresses].class != Array
-        hosts = wspace.hosts.where(address: opts[:addresses])
-        return { error: { message: "Unable to find hosts for specified addresses" } } if hosts.nil?
-      end
-
       deleted = []
-      hosts.each do |host|
+      opts[:ids].each do |host_id|
+        host = Mdm::Host.find(host_id)
         begin
           deleted << host.destroy
         rescue # refs suck
diff --git a/lib/msf/core/db_manager/http/servlet/loot_servlet.rb b/lib/msf/core/db_manager/http/servlet/loot_servlet.rb
diff --git a/lib/msf/core/db_manager/loot.rb b/lib/msf/core/db_manager/loot.rb
diff --git a/lib/msf/ui/console/command_dispatcher/db.rb b/lib/msf/ui/console/command_dispatcher/db.rb
