Distribute requires to where they are needed

MSP-11124

Push requires down to the Msf::DBManager mixins that actually need them.

lib/msf/core/db_manager.rb

@@ -1,51 +1,9 @@
 # -*- coding: binary -*-
 
-#
-# Standard Library
-#
-
-require 'csv'
-require 'fileutils'
-require 'shellwords'
-require 'tmpdir'
-require 'uri'
-
-#
 #
 # Gems
 #
-#
 
-#
-# PacketFu
-#
-
-require 'packetfu'
-
-#
-# Rex
-#
-
-require 'rex/parser/acunetix_nokogiri'
-require 'rex/parser/appscan_nokogiri'
-require 'rex/parser/burp_session_nokogiri'
-require 'rex/parser/ci_nokogiri'
-require 'rex/parser/foundstone_nokogiri'
-require 'rex/parser/fusionvm_nokogiri'
-require 'rex/parser/ip360_aspl_xml'
-require 'rex/parser/ip360_xml'
-require 'rex/parser/mbsa_nokogiri'
-require 'rex/parser/nessus_xml'
-require 'rex/parser/netsparker_xml'
-require 'rex/parser/nexpose_raw_nokogiri'
-require 'rex/parser/nexpose_simple_nokogiri'
-require 'rex/parser/nexpose_xml'
-require 'rex/parser/nmap_nokogiri'
-require 'rex/parser/nmap_xml'
-require 'rex/parser/openvas_nokogiri'
-require 'rex/parser/outpost24_nokogiri'
-require 'rex/parser/retina_xml'
-require 'rex/parser/wapiti_nokogiri'
 require 'rex/socket'
 
 #

lib/msf/core/db_manager/import.rb

@@ -1,3 +1,38 @@
+#
+# Standard library
+#
+
+require 'csv'
+require 'fileutils'
+require 'tmpdir'
+require 'uri'
+
+#
+# Gems
+#
+
+require 'packetfu'
+require 'rex/parser/acunetix_nokogiri'
+require 'rex/parser/appscan_nokogiri'
+require 'rex/parser/burp_session_nokogiri'
+require 'rex/parser/ci_nokogiri'
+require 'rex/parser/foundstone_nokogiri'
+require 'rex/parser/fusionvm_nokogiri'
+require 'rex/parser/ip360_aspl_xml'
+require 'rex/parser/ip360_xml'
+require 'rex/parser/mbsa_nokogiri'
+require 'rex/parser/nessus_xml'
+require 'rex/parser/netsparker_xml'
+require 'rex/parser/nexpose_raw_nokogiri'
+require 'rex/parser/nexpose_simple_nokogiri'
+require 'rex/parser/nexpose_xml'
+require 'rex/parser/nmap_nokogiri'
+require 'rex/parser/nmap_xml'
+require 'rex/parser/openvas_nokogiri'
+require 'rex/parser/outpost24_nokogiri'
+require 'rex/parser/retina_xml'
+require 'rex/parser/wapiti_nokogiri'
+
 module Msf::DBManager::Import
   # If hex notation is present, turn them into a character.
   def dehex(str)

lib/msf/core/db_manager/module_cache.rb

@@ -1,3 +1,9 @@
+#
+# Standard library
+#
+
+require 'shellwords'
+
 module Msf::DBManager::ModuleCache
   #
   # Attributes

lib/msf/core/db_manager/report.rb

@@ -1,3 +1,9 @@
+#
+# Standard library
+#
+
+require 'fileutils'
+
 module Msf::DBManager::Report
   # TODO This method does not attempt to find. It just creates
   # a report based on the passed params.