Merge branch 'staging/electro-release' into feature/MSP-10660/realm_adjustments

Gemfile

@@ -7,7 +7,7 @@ group :db do
   # Needed for Msf::DbManager
   gem 'activerecord', '>= 3.0.0', '< 4.0.0'
   # Metasploit::Credential database models
-  gem 'metasploit-credential', git: 'github-metasploit-credential:rapid7/metasploit-credential.git', tag: 'v0.5.5.pre.electro.pre.release'
+  gem 'metasploit-credential', git: 'github-metasploit-credential:rapid7/metasploit-credential.git', tag: 'v0.5.6.pre.electro.pre.release'
   # Database models shared between framework and Pro.
   gem 'metasploit_data_models', '>= 0.18.0', '< 0.19'
   # Needed for module caching in Mdm::ModuleDetails

Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: github-metasploit-credential:rapid7/metasploit-credential.git
-  revision: 5f83705b0f6b918159ba7c86dabb518b716f9ed6
-  tag: v0.5.5.pre.electro.pre.release
+  revision: 8a8b4f74535d728b1852e4d4d55abb9d828b8a8a
+  tag: v0.5.6.pre.electro.pre.release
   specs:
-    metasploit-credential (0.5.5.pre.electro.pre.release)
+    metasploit-credential (0.5.6.pre.electro.pre.release)
       metasploit-concern (~> 0.1.0)
       metasploit-model (>= 0.25.1, < 0.26)
       metasploit_data_models (>= 0.18.0, < 0.19)

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

@@ -1,12 +1,20 @@
 # Adds associations to `Metasploit::Credential::Core` which are inverses of association on models under
 # {BruteForce::Reuse}.
+require 'metasploit/framework/credential'
+
 module Metasploit::Credential::Core::ToCredential
   extend ActiveSupport::Concern
   
   included do
     
     def to_credential
-      Metasploit::Framework::Credential.new(public: public.try(:username), private: private.try(:data), realm: realm.try(:value) )
+      Metasploit::Framework::Credential.new(
+        public:       public.try(:username), 
+        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) 
+      )
     end
     
   end

lib/metasploit/framework/credential_collection.rb

@@ -78,7 +78,7 @@ class Metasploit::Framework::CredentialCollection
   # @yieldparam credential [Metasploit::Framework::Credential]
   # @return [void]
   def each
-    if pass_file
+    if pass_file.present?
       pass_fd = File.open(pass_file, 'r:binary')
     end
 

lib/metasploit/framework/login_scanner.rb

@@ -23,8 +23,7 @@ module Metasploit
         unless @required
           # Make sure we've required all the scanner classes
           dir = File.expand_path("../login_scanner/", __FILE__)
-          Dir.entries(dir).each do |f|
-            f = File.join(dir, f)
+          Dir.glob(File.join(dir, "*.rb")).each do |f|
             require f if File.file?(f)
           end
           @required = true