Merges 'bug/obsolete-activerecord-patch'

Not only does this remove the patch, but adds in specs to cover the test
cases that the patch resolved. Verified all steps and landed rapid7#1592 before
landing rapid7#1611, so this is complete.

[Closes rapid7#1611]

Author: todb

Rakefile

@@ -2,12 +2,19 @@ require 'bundler/setup'
 
 require 'metasploit_data_models'
 
+pathname = Pathname.new(__FILE__)
+root = pathname.parent
+
+# add metasploit-framework/lib to load paths so rake files can just require
+# files normally without having to use __FILE__ and recalculating root and the
+# path to lib
+lib_pathname = root.join('lib')
+$LOAD_PATH.unshift(lib_pathname.to_s)
+
 #
 # load rake files like a rails engine
 #
 
-pathname = Pathname.new(__FILE__)
-root = pathname.parent
 rakefile_glob = root.join('lib', 'tasks', '**', '*.rake').to_path
 
 Dir.glob(rakefile_glob) do |rakefile|

lib/metasploit/framework.rb

@@ -0,0 +1,45 @@
+# Top-level namespace that is shared between {Metasploit::Framework
+# metasploit-framework} and pro, which uses Metasploit::Pro.
+module Metasploit
+	# Supports Rails and Rails::Engine like access to metasploit-framework so it
+	# works in compatible manner with activerecord's rake tasks and other
+	# railties.
+	module Framework
+		# Returns the environment for {Metasploit::Framework}.  Checks
+		# `METASPLOIT_FRAMEWORK_ENV` environment variable for value.  Defaults to
+		# `'development'` if `METASPLOIT_FRAMEWORK_ENV` is not set in the
+		# environment variables.
+		#
+		# {env} is a ActiveSupport::StringInquirer like `Rails.env` so it can be
+		# queried for its value.
+		#
+		# @example check if environment is development
+		#   if Metasploit::Framework.env.development?
+		#     # runs only when in development
+		#   end
+		#
+		# @return [ActiveSupport::StringInquirer] the environment name
+		def self.env
+			unless instance_variable_defined? :@env
+				name = ENV['METASPLOIT_FRAMEWORK_ENV']
+				name ||= 'development'
+				@env = ActiveSupport::StringInquirer.new(name)
+			end
+
+			@env
+		end
+
+		# Returns the root of the metasploit-framework project.  Use in place of
+		# `Rails.root`.
+		#
+		# @return [Pathname]
+		def self.root
+			unless instance_variable_defined? :@root
+				pathname = Pathname.new(__FILE__)
+				@root = pathname.parent.parent.parent
+			end
+
+			@root
+		end
+	end
+end

lib/msf/core/db_manager.rb

@@ -92,9 +92,6 @@ def initialize_database_support
 
 			initialize_metasploit_data_models
 
-			# Patches issues with ActiveRecord
-			require "msf/core/patches/active_record"
-
 			@usable = true
 
 		rescue ::Exception => e

lib/msf/core/patches/active_record.rb

@@ -1,28 +1,6 @@
 load 'active_record/railties/databases.rake'
 
-module Metasploit
-	module Framework
-		def self.env
-			unless instance_variable_defined? :@env
-				name = ENV['METASPLOIT_FRAMEWORK_ENV']
-				name ||= 'development'
-				@env = ActiveSupport::StringInquirer.new(name)
-		  end
-
-			@env
-		end
-
-		def self.root
-			unless instance_variable_defined? :@root
-				pathname = Pathname.new(__FILE__)
-				@root = pathname.parent.parent.parent
-			end
-
-			@root
-		end
-	end
-end
-
+require 'metasploit/framework'
 
 # A modification to remove dependency on Rails.env
 #