Merge branch 'jlee-r7-bug/activerecord-dep'

Author: sinn3r

lib/msf/core/db_manager.rb

@@ -1,20 +1,11 @@
 # -*- coding: binary -*-
-require "active_record"
 
 require 'msf/core'
 require 'msf/core/db'
 require 'msf/core/task_manager'
 require 'fileutils'
 require 'shellwords'
 
-# Provide access to ActiveRecord models shared w/ commercial versions
-require "metasploit_data_models"
-
-# Patches issues with ActiveRecord
-require "msf/core/patches/active_record"
-
-
-
 module Msf
 
 ###
@@ -28,24 +19,14 @@ class DBManager
 
 	# Mainly, it's Ruby 1.9.1 that cause a lot of problems now, along with Ruby 1.8.6.
 	# Ruby 1.8.7 actually seems okay, but why tempt fate? Let's say 1.9.3 and beyond.
-	def self.warn_about_rubies
+	def warn_about_rubies
 		if ::RUBY_VERSION =~ /^1\.9\.[012]($|[^\d])/
 			$stderr.puts "**************************************************************************************"
 			$stderr.puts "Metasploit requires at least Ruby 1.9.3. For an easy upgrade path, see https://rvm.io/"
 			$stderr.puts "**************************************************************************************"
 		end
 	end
 
-	# Only include Mdm if we're not using Metasploit commercial versions
-	# If Mdm::Host is defined, the dynamically created classes
-	# are already in the object space
-	begin
-    include MetasploitDataModels unless defined? Mdm::Host
-	rescue NameError => e
-	warn_about_rubies
-	raise e
-	end
-
 	# Provides :framework and other accessors
 	include Framework::Offspring
 
@@ -117,6 +98,14 @@ def initialize_database_support
 			# Database drivers can reset our KCODE, do not let them
 			$KCODE = 'NONE' if RUBY_VERSION =~ /^1\.8\./
 
+			require "active_record"
+
+			# Provide access to ActiveRecord models shared w/ commercial versions
+			require "metasploit_data_models"
+
+			# Patches issues with ActiveRecord
+			require "msf/core/patches/active_record"
+
 			@usable = true
 
 		rescue ::Exception => e
@@ -125,6 +114,18 @@ def initialize_database_support
 			return false
 		end
 
+		# Only include Mdm if we're not using Metasploit commercial versions
+		# If Mdm::Host is defined, the dynamically created classes
+		# are already in the object space
+		begin
+			unless defined? Mdm::Host
+				self.class.send :include, MetasploitDataModels
+			end
+		rescue NameError => e
+			warn_about_rubies
+			raise e
+		end
+
 		#
 		# Determine what drivers are available
 		#

lib/msf/core/module_manager/module_paths.rb

@@ -2,6 +2,8 @@
 # Gems
 #
 require 'active_support/concern'
+require 'active_support/core_ext/hash'
+require 'active_support/core_ext/module'
 
 # Deals with module paths in the {Msf::ModuleManager}
 module Msf::ModuleManager::ModulePaths