Update host delete method to return full objects of deleted hosts

Author: jbarnett-r7

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

@@ -13,6 +13,8 @@ def hosts(wspace = workspace, non_dead = false, addresses = nil)
     end
   end
 
+  # TODO: Shouldn't this proxy to RemoteHostDataService#find_or_create_host ?
+  # It's currently skipping the "find" part
   def find_or_create_host(opts)
     puts 'Calling find host'
     report_host(opts)

lib/msf/core/db_manager/host.rb

@@ -31,16 +31,14 @@ def delete_host(opts)
       deleted = []
       hosts.each do |host|
         begin
-          host.destroy
-          deleted << host.address.to_s
+          deleted << host.destroy
         rescue # refs suck
           elog("Forcibly deleting #{host.address}")
-          host.delete
-          deleted << host.address.to_s
+          deleted << host.delete
         end
       end
 
-      return { deleted: deleted }
+      return deleted
     }
   end
 

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

@@ -659,7 +659,7 @@ def cmd_hosts(*args)
 
               if mode == [:delete]
                 result = framework.db.delete_host(workspace: framework.db.workspace, addresses: host_search)
-                delete_count += result[:deleted].size
+                delete_count += result.size
               end
             end