Merge branch 'landing/4042' into upstream-master

Land rapid7#4042

 the commit.

Author: trevrosen

lib/msf/core/db_manager/host_tag.rb

@@ -3,11 +3,11 @@ module Msf::DBManager::HostTag
   # conditions and return hash as well.
   def report_host_tag(opts)
     name = opts.delete(:name)
-    raise DBImportError.new("Missing required option :name") unless name
+    raise Msf::DBImportError.new("Missing required option :name") unless name
     addr = opts.delete(:addr)
-    raise DBImportError.new("Missing required option :addr") unless addr
+    raise Msf::DBImportError.new("Missing required option :addr") unless addr
     wspace = opts.delete(:wspace)
-    raise DBImportError.new("Missing required option :wspace") unless wspace
+    raise Msf::DBImportError.new("Missing required option :wspace") unless wspace
   ::ActiveRecord::Base.connection_pool.with_connection {
     if wspace.kind_of? String
       wspace = find_workspace(wspace)

lib/msf/core/db_manager/import.rb

@@ -107,15 +107,18 @@ def import_file(args={}, &block)
       data = f.read(Metasploit::Credential::Exporter::Pwdump::FILE_ID_STRING.size)
     end
     if data.nil?
-      raise DBImportError.new("Zero-length file")
+      raise Msf::DBImportError.new("Zero-length file")
     end
 
     if data.index(Metasploit::Credential::Exporter::Pwdump::FILE_ID_STRING)
       data = ::File.open(filename, 'rb')
     else
       case data[0,4]
       when "PK\x03\x04"
-        data = Zip::File.open(filename)
+        # When Msf::DBManager::Import::MetasploitFramework is included, it's child namespace of
+        # Msf::DBManager::Import::MetasploitFramework::Zip becomes resolvable as Zip here, so need to use ::Zip so Zip
+        # is resolved as one from rubyzip gem.
+        data = ::Zip::File.open(filename)
       when "\xd4\xc3\xb2\xa1", "\xa1\xb2\xc3\xd4"
         data = PacketFu::PcapFile.new(:filename => filename)
       else
@@ -172,12 +175,14 @@ def import_file(args={}, &block)
   #
   # If there is no match, an error is raised instead.
   #
-  # @raise DBImportError if the type can't be detected
+  # @raise [Msf::DBImportError] if the type can't be detected
   def import_filetype_detect(data)
-
-    if data and data.kind_of? Zip::File
+    # When Msf::DBManager::Import::MetasploitFramework is included, it's child namespace of
+    # Msf::DBManager::Import::MetasploitFramework::Zip becomes resolvable as Zip here, so need to use ::Zip so Zip
+    # is resolved as one from rubyzip gem.
+    if data and data.kind_of? ::Zip::File
       if data.entries.empty?
-        raise DBImportError.new("The zip file provided is empty.")
+        raise Msf::DBImportError.new("The zip file provided is empty.")
       end
 
       @import_filedata ||= {}
@@ -194,7 +199,7 @@ def import_filetype_detect(data)
 
       # TODO This check for our zip export should be more extensive
       if xml_files.empty?
-        raise DBImportError.new("The zip file provided is not a Metasploit Zip Export")
+        raise Msf::DBImportError.new("The zip file provided is not a Metasploit Zip Export")
       end
 
       @import_filedata[:zip_xml] = xml_files.first
@@ -207,7 +212,7 @@ def import_filetype_detect(data)
       # Don't check for emptiness here because unlike other formats, we
       # haven't read any actual data in yet, only magic bytes to discover
       # that this is indeed a pcap file.
-      #raise DBImportError.new("The pcap file provided is empty.") if data.body.empty?
+      #raise Msf::DBImportError.new("The pcap file provided is empty.") if data.body.empty?
       @import_filedata ||= {}
       @import_filedata[:type] = "Libpcap Packet Capture"
       return :libpcap
@@ -222,7 +227,7 @@ def import_filetype_detect(data)
     # This is a text string, lets make sure its treated as binary
     data = data.unpack("C*").pack("C*")
     if data and data.to_s.strip.length == 0
-      raise DBImportError.new("The data provided to the import function was empty")
+      raise Msf::DBImportError.new("The data provided to the import function was empty")
     end
 
     # Parse the first line or 4k of data from the file
@@ -354,7 +359,7 @@ def import_filetype_detect(data)
       return :msf_pwdump
     end
 
-    raise DBImportError.new("Could not automatically determine file type")
+    raise Msf::DBImportError.new("Could not automatically determine file type")
   end
 
   # Handles timestamps from Metasploit Express/Pro imports.
@@ -440,7 +445,7 @@ def service_name_map(proto)
   def validate_import_file(data)
     begin
       import_filetype_detect(data)
-    rescue DBImportError
+    rescue Msf::DBImportError
       return false
     end
     return true

lib/msf/core/db_manager/import/acunetix.rb

@@ -27,7 +27,7 @@ def import_acunetix_xml(args={}, &block)
       end
       return true
     else # Sorry
-      raise DBImportError.new("Could not import due to missing Nokogiri parser. Try 'gem install nokogiri'.")
+      raise Msf::DBImportError.new("Could not import due to missing Nokogiri parser. Try 'gem install nokogiri'.")
     end
   end
 

lib/msf/core/db_manager/import/amap.rb

@@ -43,7 +43,7 @@ def import_amap_log_file(args={})
     when :amap_mlog
       import_amap_mlog(args.merge(:data => data))
     else
-      raise DBImportError.new("Could not determine file type")
+      raise Msf::DBImportError.new("Could not determine file type")
     end
   end
 

lib/msf/core/db_manager/import/appscan.rb

@@ -27,7 +27,7 @@ def import_appscan_xml(args={}, &block)
       end
       return true
     else # Sorry
-      raise DBImportError.new("Could not import due to missing Nokogiri parser. Try 'gem install nokogiri'.")
+      raise Msf::DBImportError.new("Could not import due to missing Nokogiri parser. Try 'gem install nokogiri'.")
     end
   end
 end

lib/msf/core/db_manager/import/burp.rb

@@ -28,7 +28,7 @@ def import_burp_session_xml(args={}, &block)
       end
       return true
     else # Sorry
-      raise DBImportError.new("Could not import due to missing Nokogiri parser. Try 'gem install nokogiri'.")
+      raise Msf::DBImportError.new("Could not import due to missing Nokogiri parser. Try 'gem install nokogiri'.")
     end
   end
 end

lib/msf/core/db_manager/import/ci.rb

@@ -27,7 +27,7 @@ def import_ci_xml(args={}, &block)
       end
       return true
     else # Sorry
-      raise DBImportError.new("Could not import due to missing Nokogiri parser. Try 'gem install nokogiri'.")
+      raise Msf::DBImportError.new("Could not import due to missing Nokogiri parser. Try 'gem install nokogiri'.")
     end
   end
 end

lib/msf/core/db_manager/import/foundstone.rb

@@ -27,7 +27,7 @@ def import_foundstone_xml(args={}, &block)
       end
       return true
     else # Sorry
-      raise DBImportError.new("Could not import due to missing Nokogiri parser. Try 'gem install nokogiri'.")
+      raise Msf::DBImportError.new("Could not import due to missing Nokogiri parser. Try 'gem install nokogiri'.")
     end
   end
 end

lib/msf/core/db_manager/import/ip360/aspl.rb

@@ -10,7 +10,7 @@ def import_ip360_aspl_xml(args={}, &block)
     bl = validate_ips(args[:blacklist]) ? args[:blacklist].split : []
 
     if not data.index("<ontology")
-      raise DBImportError.new("The ASPL file does not appear to be valid or may still be compressed")
+      raise Msf::DBImportError.new("The ASPL file does not appear to be valid or may still be compressed")
     end
 
     base = ::File.join(Msf::Config.config_directory, "data", "ncircle")

lib/msf/core/db_manager/import/ip360/v3.rb

@@ -39,7 +39,7 @@ def import_ip360_xml_v3(args={}, &block)
     end
 
     if not aspl_path
-      raise DBImportError.new("The nCircle IP360 ASPL file is not present.\n    Download ASPL from nCircle VNE | Administer | Support | Resources, unzip it, and import it first")
+      raise Msf::DBImportError.new("The nCircle IP360 ASPL file is not present.\n    Download ASPL from nCircle VNE | Administer | Support | Resources, unzip it, and import it first")
     end
 
     # parse nCircle ASPL file