Pass workspace when using db_nmap

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

@@ -124,7 +124,7 @@ class DataProxy
   end
 
   def add_opts_workspace(opts)
-    opts[:workspace] = workspace if opts[:workspace].nil? && opts[:wspace].nil?
+    opts[:workspace] = workspace.name if opts[:workspace].nil? && opts[:wspace].nil?
     opts
   end
 

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

@@ -2,7 +2,8 @@ module NmapDataProxy
 
   def import_nmap_xml_file(args = {})
     begin
-      data_service = self.get_data_service()
+      data_service = self.get_data_service
+      add_opts_workspace(args)
       data_service.import_nmap_xml_file(args)
     rescue Exception => e
       self.log_error(e, "Problem importing Nmap XML file")

lib/metasploit/framework/data_service/remote/http/remote_workspace_data_service.rb

@@ -20,6 +20,7 @@ module RemoteWorkspaceDataService
     # The @current_workspace is tracked on the client side, so attempting to call it directly from the RemoteDataService
     # will not return the correct results. Run it back through the proxy.
     wlog "[DEPRECATION] Calling workspace from within the RemoteDataService is no longer supported. Please call from WorkspaceDataProxy instead."
+    caller.each { |line| wlog "#{line}"}
     framework.db.workspace
   end
 
@@ -27,6 +28,7 @@ module RemoteWorkspaceDataService
     # The @current_workspace is tracked on the client side, so attempting to call it directly from the RemoteDataService
     # will not return the correct results. Run it back through the proxy.
     wlog "[DEPRECATION] Setting the current workspace from the RemoteDataService is no longer supported. Please call from WorkspaceDataProxy instead."
+    caller.each { |line| wlog "#{line}"}
     framework.db.workspace = workspace
   end
 

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

@@ -241,7 +241,6 @@ module Msf::DBManager::Import::Nmap
   #
   def import_nmap_xml_file(args={})
     filename = args[:filename]
-    wspace = Msf::Util::DBManager.process_opts_workspace(args, framework)
 
     data = ""
     ::File.open(filename, 'rb') do |f|

lib/rex/parser/nmap_nokogiri.rb

@@ -376,12 +376,13 @@ module Rex
       reported = []
       @report_data[:ports].each do |svc|
         scripts = svc.delete(:scripts) || []
-        svc_obj = db_report(:service, svc.merge(:host => host_object))
+        wspace = db.workspaces({:id => host_object.workspace.id}).first
+        svc_obj = db_report(:service, svc.merge(:host => host_object, :workspace => wspace.name))
         scripts.each do |script|
           script.each_pair do |k,v|
             ntype =
             nse_note = {
-              :workspace => host_object.workspace,
+              :workspace => wspace,
               :host => host_object,
               :service => svc_obj,
               :type => "nmap.nse.#{k}." + (svc[:proto] || "tcp") +".#{svc[:port]}",