Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release

Author: limhoff-r7

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metasploit-framework (4.9.3.pre.dev)
+    metasploit-framework (4.10.0.pre.dev)
       activesupport (>= 3.0.0, < 4.0.0)
       bcrypt
       json

app/concerns/metasploit/credential/core/to_credential.rb

@@ -13,7 +13,8 @@ def to_credential
         private:      private.try(:data), 
         private_type: private.try(:type).try(:demodulize).try(:underscore).try(:to_sym), 
         realm:        realm.try(:value), 
-        realm_key:    realm.try(:key) 
+        realm_key:    realm.try(:key),
+        parent:       self
       )
     end
 

lib/metasploit/framework/command/base.rb

@@ -49,8 +49,11 @@ def self.require_environment!
     parsed_options.environment!
     ARGV.replace(parsed_options.positional)
 
-    # @see https://github.com/rails/rails/blob/v3.2.17/railties/lib/rails/commands.rb#L39-L40
-    require Pathname.new(__FILE__).parent.parent.parent.parent.parent.join('config', 'application')
+    # allow other Rails::Applications to use this command
+    if !defined?(Rails) || Rails.application.nil?
+      # @see https://github.com/rails/rails/blob/v3.2.17/railties/lib/rails/commands.rb#L39-L40
+      require Pathname.new(__FILE__).parent.parent.parent.parent.parent.join('config', 'application')
+    end
 
     # have to configure before requiring environment because
     # config/environment.rb calls initialize! and the initializers will use

lib/metasploit/framework/credential.rb

@@ -87,7 +87,8 @@ def ==(other)
       end
 
       def to_credential
-        self
+        self.parent = self
+        self        
       end
 
       private

lib/metasploit/framework/login_scanner/base.rb

@@ -83,7 +83,6 @@ def each_credential
               # This could be a Credential object, or a Credential Core, or an Attempt object
               # so make sure that whatever it is, we end up with a Credential.
               credential = raw_cred.to_credential
-              credential.parent = raw_cred
 
               if credential.realm.present? && self.class::REALM_KEY.present?
                 credential.realm_key = self.class::REALM_KEY

lib/metasploit/framework/parsed_options/base.rb

@@ -57,7 +57,7 @@ def configure(application)
   #
   # @return [void]
   def environment!
-    if defined?(Rails) && Rails.instance_variable_defined?(:@_env)
+    if defined?(Rails) && Rails.instance_variable_defined?(:@_env) && Rails.env != options.environment
       raise "#{self.class}##{__method__} called too late to set RAILS_ENV: Rails.env already memoized"
     end
 
@@ -85,14 +85,16 @@ def options
       options.database.disable = false
       options.database.migrations_paths = []
 
+      # If RAILS_ENV is set, then it will be used, but if RAILS_ENV is set and the --environment option is given, then
+      # --environment value will be used to reset ENV[RAILS_ENV].
+      options.environment = ENV['RAILS_ENV'] || DEFAULT_ENVIRONMENT
+
       options.framework = ActiveSupport::OrderedOptions.new
       options.framework.config = nil
 
       options.modules = ActiveSupport::OrderedOptions.new
       options.modules.path = nil
 
-      options.environment = DEFAULT_ENVIRONMENT
-
       @options = options
     end
 

lib/metasploit/framework/version.rb

@@ -2,8 +2,8 @@ module Metasploit
   module Framework
     module Version
       MAJOR = 4
-      MINOR = 9
-      PATCH = 3
+      MINOR = 10
+      PATCH = 0
       PRERELEASE = 'dev'
     end
 

spec/lib/msf/core/framework_spec.rb

@@ -6,7 +6,7 @@
 describe Msf::Framework do
 
   describe "#version" do
-    CURRENT_VERSION = "4.9.3-dev"
+    CURRENT_VERSION = "4.10.0-dev"
 
     subject do
       described_class.new

spec/support/shared/examples/credential/core/to_credential.rb

@@ -16,6 +16,11 @@
         ).to be_a Metasploit::Framework::Credential
       end
 
+      it "should set the parent to the credential object" do
+        expect(
+          crednetial_core.to_credential.parent
+        ).to eq(crednetial_core)
+      end
     end
   end
 end