Merge branch 'master' into bug/multiple-migrations-have-version-in-specs

Author: limhoff-r7

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

spec/lib/msf/db_manager_spec.rb

@@ -1430,7 +1430,7 @@ def loader.load_error(module_path, error)
 		end
 
 		let(:module_set) do
-			framework.exploits
+			framework.modules.module_set(module_type)
 		end
 
 		let(:module_type) do
@@ -1776,6 +1776,28 @@ def loader.load_error(module_path, error)
 					end
 				end
 			end
+
+			it_should_behave_like 'Msf::DBManager#update_module_details with module',
+														:reference_name => 'admin/2wire/xslt_password_reset',
+														:type => 'auxiliary'
+
+			it_should_behave_like 'Msf::DBManager#update_module_details with module',
+														:reference_name => 'generic/none',
+														:type => 'encoder'
+
+			it_should_behave_like 'Msf::DBManager#update_module_details with module',
+														:reference_name => 'windows/smb/ms08_067_netapi',
+														:type => 'exploit'
+
+			it_should_behave_like 'Msf::DBManager#update_module_details with module',
+														:reference_name => 'x64/simple',
+														:type => 'nop'
+
+			# @todo determine how to load a single payload to test payload type outside of msfconsole
+
+ 			it_should_behave_like 'Msf::DBManager#update_module_details with module',
+														:reference_name => 'windows/escalate/screen_unlock',
+														:type => 'post'
 		end
 
 		context 'without migrated' do

spec/support/shared/examples/msf/db_manager/update_module_details_with_module_type.rb

@@ -0,0 +1,26 @@
+shared_examples_for 'Msf::DBManager#update_module_details with module' do |options={}|
+	options.assert_valid_keys(:reference_name, :type)
+
+	reference_name = options.fetch(:reference_name)
+	type = options.fetch(:type)
+
+	context "with #{type.inspect}" do
+		let(:module_reference_name) do
+			reference_name
+		end
+
+		let(:module_type) do
+			type
+		end
+
+		it "should use module_instance with #{type.inspect} type" do
+			module_instance.type.should == type
+		end
+
+		it 'should not raise error' do
+			expect {
+				update_module_details
+			}.to_not raise_error
+		end
+	end
+end