Merge branch 'feature/MSP-10658/to_credential' into staging/electro-release

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