Update Mdm and Add Task stuff to report

make report_* methods aware of Tasks

[Story #49167601]

Author: David Maloney

Gemfile

@@ -15,7 +15,7 @@ group :db do
 	# Needed for Msf::DbManager
 	gem 'activerecord'
 	# Database models shared between framework and Pro.
-	gem 'metasploit_data_models', '~> 0.14.3'
+	gem 'metasploit_data_models', '~> 0.15.0'
 	# Needed for module caching in Mdm::ModuleDetails
 	gem 'pg', '>= 0.11'
 end

Gemfile.lock

@@ -23,7 +23,7 @@ GEM
     i18n (0.6.1)
     json (1.7.7)
     metaclass (0.0.1)
-    metasploit_data_models (0.14.3)
+    metasploit_data_models (0.15.0)
       activerecord (>= 3.2.13)
       activesupport
       pg
@@ -65,7 +65,7 @@ DEPENDENCIES
   database_cleaner
   factory_girl (>= 4.1.0)
   json
-  metasploit_data_models (~> 0.14.3)
+  metasploit_data_models (~> 0.15.0)
   msgpack
   nokogiri
   pcaprub

lib/msf/core/auxiliary/report.rb

@@ -21,7 +21,17 @@ def db
 
 	def myworkspace
 		@myworkspace = framework.db.find_workspace(self.workspace)
-	end
+  end
+
+  def mytask
+    if self[:task]
+      return self[:task].record
+    elsif @task && @task.class == Mdm::Task
+      return @task
+    else
+      return nil
+    end
+  end
 
 	def inside_workspace_boundary?(ip)
 		return true if not framework.db.active
@@ -41,7 +51,10 @@ def inside_workspace_boundary?(ip)
 	#
 	def report_host(opts)
 		return if not db
-		opts = {:workspace => myworkspace}.merge(opts)
+		opts = {
+      :workspace => myworkspace,
+      :task => mytask
+    }.merge(opts)
 		framework.db.report_host(opts)
 	end
 
@@ -63,7 +76,10 @@ def get_host(opts)
 	#
 	def report_client(opts={})
 		return if not db
-		opts = {:workspace => myworkspace}.merge(opts)
+    opts = {
+        :workspace => myworkspace,
+        :task => mytask
+    }.merge(opts)
 		framework.db.report_client(opts)
 	end
 
@@ -78,63 +94,93 @@ def get_client(opts={})
 	#
 	def report_service(opts={})
 		return if not db
-		opts = {:workspace => myworkspace}.merge(opts)
+    opts = {
+        :workspace => myworkspace,
+        :task => mytask
+    }.merge(opts)
 		framework.db.report_service(opts)
 	end
 
 	def report_note(opts={})
 		return if not db
-		opts = {:workspace => myworkspace}.merge(opts)
+    opts = {
+        :workspace => myworkspace,
+        :task => mytask
+    }.merge(opts)
 		framework.db.report_note(opts)
 	end
 
 	def report_auth_info(opts={})
 		return if not db
-		opts = {:workspace => myworkspace}.merge(opts)
+    opts = {
+        :workspace => myworkspace,
+        :task => mytask
+    }.merge(opts)
 		framework.db.report_auth_info(opts)
 	end
 
 	def report_vuln(opts={})
 		return if not db
-		opts = {:workspace => myworkspace}.merge(opts)
+    opts = {
+        :workspace => myworkspace,
+        :task => mytask
+    }.merge(opts)
 		framework.db.report_vuln(opts)
 	end
 
 	# This will simply log a deprecation warning, since report_exploit()
 	# is no longer implemented.
 	def report_exploit(opts={})
 		return if not db
-		opts = {:workspace => myworkspace}.merge(opts)
+    opts = {
+        :workspace => myworkspace,
+        :task => mytask
+    }.merge(opts)
 		framework.db.report_exploit(opts)
 	end
 
 	def report_loot(opts={})
 		return if not db
-		opts = {:workspace => myworkspace}.merge(opts)
+    opts = {
+        :workspace => myworkspace,
+        :task => mytask
+    }.merge(opts)
 		framework.db.report_loot(opts)
 	end
 
 	def report_web_site(opts={})
 		return if not db
-		opts = {:workspace => myworkspace}.merge(opts)
+    opts = {
+        :workspace => myworkspace,
+        :task => mytask
+    }.merge(opts)
 		framework.db.report_web_site(opts)
 	end
 
 	def report_web_page(opts={})
 		return if not db
-		opts = {:workspace => myworkspace}.merge(opts)
+    opts = {
+        :workspace => myworkspace,
+        :task => mytask
+    }.merge(opts)
 		framework.db.report_web_page(opts)
 	end
 
 	def report_web_form(opts={})
 		return if not db
-		opts = {:workspace => myworkspace}.merge(opts)
+    opts = {
+        :workspace => myworkspace,
+        :task => mytask
+    }.merge(opts)
 		framework.db.report_web_form(opts)
 	end
 
 	def report_web_vuln(opts={})
 		return if not db
-		opts = {:workspace => myworkspace}.merge(opts)
+    opts = {
+        :workspace => myworkspace,
+        :task => mytask
+    }.merge(opts)
 		framework.db.report_web_vuln(opts)
 	end
 

lib/msf/core/db.rb

@@ -376,6 +376,13 @@ def report_host(opts)
 			host.save!
 		end
 
+    if opts[:task]
+      Mdm::TaskHost.new(
+          :task => opts[:task],
+          :host => host
+      )
+    end
+
 		host
 	}
 	end
@@ -592,7 +599,15 @@ def report_service(opts)
 		if (service and service.changed?)
 			msf_import_timestamps(opts,service)
 			service.save!
-		end
+    end
+
+    if opts[:task]
+      Mdm::TaskService.new(
+          :task => opts[:task],
+          :service => service
+      )
+    end
+
 		ret[:service] = service
 	}
 	end
@@ -1588,7 +1603,16 @@ def report_auth_info(opts={})
 		unless opts[:updated_at] || opts["updated_at"]
 			cred.updated_at = Time.now.utc
 			cred.save!
-		end
+    end
+
+    if opts[:task]
+      require 'pry'
+      binding.pry
+      Mdm::TaskCred.new(
+          :task => opts[:task],
+          :cred => cred
+      )
+    end
 
 		ret[:cred] = cred
 	end