From 790a08a8487fec95fbec4dca78a798697c1a17b0 Mon Sep 17 00:00:00 2001
From: James Lee <egypt@metasploit.com>
Date: Mon, 30 Mar 2015 16:21:17 -0500
Subject: [PATCH] It's pronounced "exploit", not "assoc_exploit"

---
 lib/msf/core/db_manager/session.rb                     | 10 +++++-----
 spec/support/shared/examples/msf/db_manager/session.rb |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/msf/core/db_manager/session.rb b/lib/msf/core/db_manager/session.rb
index 93d58cba1e..707e9e8005 100644
--- a/lib/msf/core/db_manager/session.rb
+++ b/lib/msf/core/db_manager/session.rb
@@ -92,11 +92,11 @@ module Msf::DBManager::Session
 
     if opts[:session]
       session.db_record = s
-      if session.assoc_exploit.user_data_is_match?
+      if session.exploit.user_data_is_match?
         MetasploitDataModels::AutomaticExploitation::MatchResult.create!(
-          match: session.assoc_exploit.user_data[:match],
-          match_set: session.assoc_exploit.user_data[:match_set],
-          run: session.assoc_exploit.user_data[:run],
+          match: session.exploit.user_data[:match],
+          match_set: session.exploit.user_data[:match_set],
+          run: session.exploit.user_data[:run],
           state: 'succeeded',
         )
       elsif session.via_exploit
@@ -132,7 +132,7 @@ module Msf::DBManager::Session
         host: host,
         info: "Exploited by #{mod_fullname} to create Session #{s.id}",
         name: mod_name,
-        refs: mod_detail.refs,
+        refs: mod_detail.refs.map { |ref| ref.name },
         workspace: wspace,
       }
 
diff --git a/spec/support/shared/examples/msf/db_manager/session.rb b/spec/support/shared/examples/msf/db_manager/session.rb
index 80ddc721b2..92dfb26a09 100644
--- a/spec/support/shared/examples/msf/db_manager/session.rb
+++ b/spec/support/shared/examples/msf/db_manager/session.rb
@@ -68,7 +68,7 @@ shared_examples_for 'Msf::DBManager::Session' do
 
           let(:session) do
             session_class.new.tap do |session|
-              session.assoc_exploit = module_instance
+              session.exploit = module_instance
               session.exploit_datastore = exploit_datastore
               session.info = 'Info'
               session.platform = 'Platform'
@@ -85,7 +85,7 @@ shared_examples_for 'Msf::DBManager::Session' do
             Class.new do
               include Msf::Session
 
-              attr_accessor :assoc_exploit
+              attr_accessor :exploit
               attr_accessor :datastore
               attr_accessor :platform
               attr_accessor :type