Extract Msf::DBManager::ExploitedHost

MSP-11124

Extract methods related to `Mdm::ExploitedHost`s.

lib/msf/core/db_manager.rb

@@ -76,6 +76,7 @@ class DBManager
   extend Metasploit::Framework::Require
 
   autoload :Cred, 'msf/core/db_manager/cred'
+  autoload :ExploitedHost, 'msf/core/db_manager/exploited_host'
   autoload :Host, 'msf/core/db_manager/host'
   autoload :IPAddress, 'msf/core/db_manager/ip_address'
   autoload :ModuleCache, 'msf/core/db_manager/module_cache'
@@ -87,6 +88,7 @@ class DBManager
   optionally_include_metasploit_credential_creation
 
   include Msf::DBManager::Cred
+  include Msf::DBManager::ExploitedHost
   include Msf::DBManager::Host
   include Msf::DBManager::ImportMsfXml
   include Msf::DBManager::IPAddress
@@ -981,15 +983,6 @@ class DBManager
   }
   end
 
-  #
-  # This method returns a list of all exploited hosts in the database.
-  #
-  def exploited_hosts(wspace=workspace)
-  ::ActiveRecord::Base.connection_pool.with_connection {
-    wspace.exploited_hosts
-  }
-  end
-
   #
   # This method iterates the notes table calling the supplied block with the
   # note instance of each entry.
@@ -1193,14 +1186,6 @@ class DBManager
   }
   end
 
-  def each_exploited_host(wspace=workspace,&block)
-  ::ActiveRecord::Base.connection_pool.with_connection {
-    wspace.exploited_hosts.each do |eh|
-      block.call(eh)
-    end
-  }
-  end
-
   #
   # Find or create a vuln matching this service/name
   #

lib/msf/core/db_manager/exploited_host.rb

@@ -0,0 +1,16 @@
+module Msf::DBManager::ExploitedHost
+  def each_exploited_host(wspace=workspace,&block)
+  ::ActiveRecord::Base.connection_pool.with_connection {
+    wspace.exploited_hosts.each do |eh|
+      block.call(eh)
+    end
+  }
+  end
+
+  # This method returns a list of all exploited hosts in the database.
+  def exploited_hosts(wspace=workspace)
+  ::ActiveRecord::Base.connection_pool.with_connection {
+    wspace.exploited_hosts
+  }
+  end
+end