Merge branch 'master' of https://github.com/rapid7/metasploit-framework

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.16.0'
+	gem 'metasploit_data_models', '~> 0.16.1'
 	# 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.16.0)
+    metasploit_data_models (0.16.1)
       activerecord (>= 3.2.13)
       activesupport
       pg
@@ -65,7 +65,7 @@ DEPENDENCIES
   database_cleaner
   factory_girl (>= 4.1.0)
   json
-  metasploit_data_models (~> 0.15.2)
+  metasploit_data_models (~> 0.16.1)
   msgpack
   nokogiri
   pcaprub

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130531144949) do
+ActiveRecord::Schema.define(:version => 20130604145732) do
 
   create_table "api_keys", :force => true do |t|
     t.text     "token"
@@ -440,6 +440,13 @@ ActiveRecord::Schema.define(:version => 20130531144949) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "task_sessions", :force => true do |t|
+    t.integer  "task_id",    :null => false
+    t.integer  "session_id", :null => false
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "tasks", :force => true do |t|
     t.integer  "workspace_id",                 :default => 1, :null => false
     t.string   "created_by"

lib/msf/core/db.rb

@@ -786,6 +786,14 @@ class DBManager
 		s = ::Mdm::Session.new(sess_data)
 		s.save!
 
+    if session and session.exploit_task and session.exploit_task.record
+      session_task =  session.exploit_task.record
+      if session_task.class == Mdm::Task
+        Mdm::TaskSession.create(:task => session_task, :session => s )
+      end
+    end
+
+
 		if opts[:session]
 			session.db_record = s
 		end

lib/msf/core/session.rb

@@ -270,6 +270,9 @@ module Session
 		self.user_output = m.user_output if m.user_output
 		self.exploit_uuid = m.uuid
 		self.exploit = m
+    if m[:task]
+      self.exploit_task = m[:task]
+    end
 	end
 
 	#
@@ -365,6 +368,10 @@ module Session
 	# The datastore of the exploit that created this session
 	#
 	attr_accessor :exploit_datastore
+  #
+  # The task that ran the exploit that got the session (that swallowed the fly)
+  #
+  attr_accessor :exploit_task
 	#
 	# The specific identified session info
 	#

scripts/meterpreter/process_memdump.rb

@@ -27,8 +27,8 @@ opts.parse(args) { |opt, idx, val|
 	when "-h"
 		print_line("")
 		print_line("USAGE:")
-		print_line("EXAMPLE: run process_dump putty.exe")
-		print_line("EXAMPLE: run process_dump -p 1234")
+		print_line("EXAMPLE: run process_memdump putty.exe")
+		print_line("EXAMPLE: run process_memdump -p 1234")
 		print_line(opts.usage)
 		raise Rex::Script::Completed
 	when "-p"