Address PR comments

Author: jbarnett-r7

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

@@ -8,7 +8,7 @@ def report_loot(opts)
       end
       data_service.report_loot(opts)
     rescue Exception => e
-      elog "Call to #{data_service.class}#report_loot threw exception: #{e.message}"
+      elog "Problem creating loot: #{e.message}"
     end
   end
 
@@ -24,7 +24,7 @@ def loots(wspace, opts = {})
       opts[:wspace] = wspace
       data_service.loot(opts)
     rescue Exception => e
-      elog "Call to #{data_service.class}#loots threw exception: #{e.message}"
+      elog "Problem retrieving loot: #{e.message}"
       e.backtrace.each { |line| elog "#{line}\n" }
     end
   end
@@ -35,7 +35,7 @@ def update_loot(opts)
       data_service = self.get_data_service
       data_service.update_loot(opts)
     rescue Exception => e
-      elog "Call to #{data_service.class}#update_loot threw exception: #{e.message}"
+      elog "Problem updating loot: #{e.message}"
       e.backtrace.each { |line| elog "#{line}\n" }
     end
   end

lib/msf/core/db_manager/host.rb

@@ -9,7 +9,7 @@ def del_host(wspace, address, comm='')
   }
   end
 
-  # Deletes Loot entries based on the IDs passed in.
+  # 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.

lib/msf/core/db_manager/loot.rb

@@ -91,12 +91,12 @@ def report_loot(opts)
   }
   end
 
+  # Update the attributes of a Loot entry with the values in opts.
+  # The values in opts should match the attributes to update.
+  #
+  # @param opts [Hash] Hash containing the updated values. Key should match the attribute to update. Must contain :id of record to update.
+  # @return [Mdm::Loot] The updated Mdm::Loot object.
   def update_loot(opts)
-    wspace = opts.delete(:workspace) || opts.delete(:wspace) || workspace
-    if wspace.kind_of? String
-      wspace = find_workspace(wspace)
-    end
-
     ::ActiveRecord::Base.connection_pool.with_connection {
       id = opts.delete(:id)
       Mdm::Loot.update(id, opts)

lib/msf/ui/console/command_dispatcher/db.rb

@@ -650,12 +650,6 @@ def cmd_hosts(*args)
               break if !host_search.nil? && host_search.empty?
 
               framework.db.hosts(framework.db.workspace, onlyup, host_search, search_term = search_term).each do |host|
-                # if search_term
-                #   next unless (
-                #   host.attribute_names.any? { |a| host[a.intern].to_s.match(search_term) } || !find_hosts_with_tag(framework.db.workspace.id, host.address, search_term.source).empty?
-                #   )
-                # end
-
                 matched_host_ids << host.id
                 columns = col_names.map do |n|
                   # Deal with the special cases
@@ -1370,13 +1364,7 @@ def cmd_loot(*args)
             end
 
             loots.each do |loot|
-              next if(types and types.index(loot.ltype).nil?)
-              # if search_term
-              #   next unless(
-              #   loot.attribute_names.any? { |a| loot[a.intern].to_s.match(search_term) } or
-              #       loot.host.attribute_names.any? { |a| loot.host[a.intern].to_s.match(search_term) }
-              #   )
-              # end
+              next if types and types.index(loot.ltype).nil?
               row = []
               # TODO: This is just a temp implementation of update for the time being since it did not exist before.
               # It should be updated to not pass all of the attributes attached to the object, only the ones being updated.