Allow filtering of loot

Author: jbarnett-r7

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

@@ -9,13 +9,10 @@ def report_loot(opts)
     end
   end
 
-  def loots(wspace, non_dead = false, addresses = nil)
+  def loots(wspace, opts = {})
     begin
       data_service = self.get_data_service
-      opts = {}
       opts[:wspace] = wspace
-      opts[:non_dead] = non_dead
-      opts[:addresses] = addresses
       data_service.loot(opts)
     rescue Exception => e
       puts "Call to #{data_service.class}#loots threw exception: #{e.message}"

lib/msf/core/db_manager/loot.rb

@@ -25,13 +25,13 @@ def find_or_create_loot(opts)
   # This methods returns a list of all loot in the database
   #
   def loots(opts)
-    wspace = opts[:workspace] || opts[:wspace] || workspace
+    wspace = opts.delete(:workspace) || opts.delete(:wspace) || workspace
     if wspace.kind_of? String
       wspace = find_workspace(wspace)
     end
 
     ::ActiveRecord::Base.connection_pool.with_connection {
-      wspace.loots
+      wspace.loots.where(opts)
     }
   end
   alias_method :loot, :loots

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

@@ -1272,8 +1272,9 @@ def cmd_loot(*args)
 
     each_host_range_chunk(host_ranges) do |host_search|
       framework.db.hosts(framework.db.workspace, false, host_search).each do |host|
-        if host.loots
-          host.loots.each do |loot|
+        loots = framework.db.loots(framework.db.workspace, {:host_id => host.id})
+        if loots
+          loots.each do |loot|
             next if(types and types.index(loot.ltype).nil?)
             if search_term
             next unless(
@@ -1307,9 +1308,8 @@ def cmd_loot(*args)
 
     # Handle hostless loot
     if host_ranges.compact.empty? # Wasn't a host search
-      hostless_loot = framework.db.loot(framework.db.workspace)
+      hostless_loot = framework.db.loots(framework.db.workspace, {:host_id => nil})
       hostless_loot.each do |loot|
-        next unless loot.host_id = nil
         row = []
         row.push("")
         row.push("")