Remove separate code path for openstruct for creds.

Also fix RemoteCredentialDataService to work with json_to_mdm

Author: jbarnett-r7

lib/metasploit/framework/data_service/remote/http/remote_credential_data_service.rb

@@ -8,7 +8,14 @@ module RemoteCredentialDataService
   CREDENTIAL_MDM_CLASS = 'Metasploit::Credential::Core'
 
   def creds(opts = {})
-    json_to_mdm_object(self.get_data(CREDENTIAL_API_PATH, opts), CREDENTIAL_MDM_CLASS, [])
+    data = self.get_data(CREDENTIAL_API_PATH, opts)
+    rv = json_to_mdm_object(data, CREDENTIAL_MDM_CLASS, [])
+    parsed_body = JSON.parse(data.response.body)
+    parsed_body.each do |cred|
+      private_object = to_ar(cred['private_class'].constantize, cred['private'])
+      rv[parsed_body.index(cred)].private = private_object
+    end
+    rv
   end
 
   def create_credential(opts)

lib/msf/core/db_manager/http/servlet/credential_servlet.rb

@@ -23,7 +23,7 @@ def self.get_credentials
         # This is normally pulled from a class method from the MetasploitCredential class
         response = []
         data.each do |cred|
-          json = cred.as_json(include: includes).merge('human' => cred.private.class.model_name.human)
+          json = cred.as_json(include: includes).merge('private_class' => cred.private.class.to_s)
           response << json
         end
         set_json_response(response)

lib/msf/ui/console/command_dispatcher/creds.rb

@@ -424,16 +424,7 @@ def creds_search(*args)
         public_val = core.public ? core.public.username : ""
         private_val = core.private ? core.private.data : ""
         realm_val = core.realm ? core.realm.value : ""
-        human_val = ""
-        # TODO: We shouldn't have separate code paths depending on the model we're working with
-        # This should always expect an OpenStruct.
-        if core.private
-          if core.private.is_a?(OpenStruct)
-            human_val = core.human
-          else
-            human_val = core.private.class.model_name.human
-          end
-        end
+        human_val = core.private ? core.private.class.model_name.human : ""
 
         tbl << [
           "", # host
@@ -442,7 +433,7 @@ def creds_search(*args)
           public_val,
           private_val,
           realm_val,
-          human_val,
+          human_val
         ]
       else
         core.logins.each do |login|
@@ -466,22 +457,13 @@ def creds_search(*args)
           public_val = core.public ? core.public.username : ""
           private_val = core.private ? core.private.data : ""
           realm_val = core.realm ? core.realm.value : ""
-          human_val = ""
-          # TODO: We shouldn't have separate code paths depending on the model we're working with
-          # This should always expect an OpenStruct.
-          if core.private
-            if core.private.is_a?(OpenStruct)
-              human_val = core.human
-            else
-              human_val = core.private.class.model_name.human
-            end
-          end
+          human_val = core.private ? core.private.class.model_name.human : ""
 
           row += [
             public_val,
             private_val,
             realm_val,
-            human_val,
+            human_val
           ]
           tbl << row
         end