fix to_credential on core

the Metasploit::Credential::Core to_credential method now seats private_type and realm_key correctly
bailian · Jul 7, 2014 · 38419da · 38419da
1 parent aeda74f
commit 38419da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/concerns/metasploit/credential/core/to_credential.rb b/app/concerns/metasploit/credential/core/to_credential.rb
@@ -1,12 +1,19 @@
 # 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) )
+      if private.present?
+        private_type = private.type.demodulize.underscore.to_sym
+      else
+        private_type = nil
+      end
+      Metasploit::Framework::Credential.new(public: public.try(:username), private: private.try(:data), private_type: private_type, realm: realm.try(:value), realm_key: realm.try(:key) )
     end
 
   end

diff --git a/lib/metasploit/framework/credential_collection.rb b/lib/metasploit/framework/credential_collection.rb
@@ -78,7 +78,7 @@ def prepend_cred(cred)
   # @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