Merge branch 'bug/9582-metasploit-imports-and-tasks'

Land rapid7#3299

Author: shuckins-r7

lib/msf/core/db.rb

@@ -4262,7 +4262,10 @@ def import_retina_xml(args={}, &block)
     parser = Rex::Parser::RetinaXMLStreamParser.new
     parser.on_found_host = Proc.new do |host|
       hobj = nil
-      data = {:workspace => wspace}
+      data = {
+        :workspace => wspace,
+        :task      => args[:task]
+      }
       addr = host['address']
       next if not addr
 

lib/msf/core/db_manager/import_msf_xml.rb

@@ -204,6 +204,7 @@ def import_msf_xml(args={}, &block)
 
         doc.elements.each("/#{btag}/hosts/host") do |host|
           host_data = {}
+          host_data[:task] = args[:task]
           host_data[:workspace] = wspace
           host_data[:host] = nils_for_nulls(host.elements["address"].text.to_s.strip)
           if bl.include? host_data[:host]
@@ -247,6 +248,7 @@ def import_msf_xml(args={}, &block)
 
           host.elements.each('services/service') do |service|
             service_data = {}
+            service_data[:task] = args[:task]
             service_data[:workspace] = wspace
             service_data[:host] = hobj
             service_data[:port] = nils_for_nulls(service.elements["port"].text.to_s.strip).to_i