Dont wrap object in array when using ID parameter

lib/msf/core/db_manager/cred.rb

@@ -5,7 +5,7 @@ module Msf::DBManager::Cred
     ::ActiveRecord::Base.connection_pool.with_connection {
       # If :id exists we're looking for a specific record, skip the other stuff
       if opts[:id] && !opts[:id].empty?
-        return Metasploit::Credential::Core.find(opts[:id])
+        return Array.wrap(Metasploit::Credential::Core.find(opts[:id]))
       end
 
       wspace = Msf::Util::DBManager.process_opts_workspace(opts, framework)

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

@@ -9,7 +9,7 @@ module CredentialServlet
   end
 
   def self.registered(app)
-    app.get CredentialServlet.api_path, &get_credentials
+    app.get CredentialServlet.api_path_with_id, &get_credentials
     app.post CredentialServlet.api_path, &create_credential
     app.put CredentialServlet.api_path_with_id, &update_credential
     app.delete CredentialServlet.api_path, &delete_credentials
@@ -33,6 +33,8 @@ module CredentialServlet
           json = cred.as_json(include: includes).merge(private_class: cred.private.class.to_s)
           response << json
         end
+        # Only return the single object if the user used the resource/ID GET request
+        data = data.first if data.count == 1 && request.url =~ /\/\d$/
         response = format_cred_json(data)
         set_json_data_response(response: response)
       rescue => e

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

@@ -31,6 +31,8 @@ module HostServlet
         sanitized_params = sanitize_params(params)
         data = get_db.hosts(sanitized_params)
         includes = [:loots]
+        # Only return the single object if the user used the resource/ID GET request
+        data = data.first if data.count == 1 && request.url =~ /\/\d$/
         set_json_data_response(response: data, includes: includes)
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error getting hosts:', code: 500)

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

@@ -23,8 +23,10 @@ module LoginServlet
     lambda {
       begin
         sanitized_params = sanitize_params(params)
-        response = get_db.logins(sanitized_params)
+        data = get_db.logins(sanitized_params)
-        set_json_response(response)
+        # Only return the single object if the user used the resource/ID GET request
+        data = data.first if data.count == 1 && request.url =~ /\/\d$/
+        set_json_response(data)
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error retrieving logins:', code: 500)
       end

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

@@ -61,6 +61,8 @@ module LootServlet
         tmp_params = sanitize_params(params)
         opts[:id] = tmp_params[:id] if tmp_params[:id]
         data = get_db.update_loot(opts)
+        # Only return the single object if the user used the resource/ID GET request
+        data = data.first if data.count == 1 && request.url =~ /\/\d$/
         set_json_data_response(response: data)
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error updating the loot:', code: 500)

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

@@ -51,6 +51,8 @@ module NoteServlet
         tmp_params = sanitize_params(params)
         opts[:id] = tmp_params[:id] if tmp_params[:id]
         data = get_db.update_note(opts)
+        # Only return the single object if the user used the resource/ID GET request
+        data = data.first if data.count == 1 && request.url =~ /\/\d$/
         set_json_data_response(response: data)
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error updating the note:', code: 500)

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

@@ -26,6 +26,8 @@ module ServiceServlet
         sanitized_params = sanitize_params(params)
         data = get_db.services(sanitized_params)
         includes = [:host]
+        # Only return the single object if the user used the resource/ID GET request
+        data = data.first if data.count == 1 && request.url =~ /\/\d$/
         set_json_data_response(response: data, includes: includes)
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error retrieving services:', code: 500)

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

@@ -23,6 +23,8 @@ module SessionEventServlet
       begin
         sanitized_params = sanitize_params(params)
         data = get_db.session_events(sanitized_params)
+        # Only return the single object if the user used the resource/ID GET request
+        data = data.first if data.count == 1 && request.url =~ /\/\d$/
         set_json_data_response(response: data)
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error retrieving session events:', code: 500)

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

@@ -24,6 +24,8 @@ module SessionServlet
         sanitized_params = sanitize_params(params)
         data = get_db.sessions(sanitized_params)
         includes = [:host]
+        # Only return the single object if the user used the resource/ID GET request
+        data = data.first if data.count == 1 && request.url =~ /\/\d$/
         set_json_data_response(response: data, includes: includes)
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error retrieving sessions:', code: 500)

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

@@ -50,6 +50,8 @@ module UserServlet
         tmp_params = sanitize_params(params)
         opts[:id] = tmp_params[:id] if tmp_params[:id]
         data = get_db.update_user(opts)
+        # Only return the single object if the user used the resource/ID GET request
+        data = data.first if data.count == 1 && request.url =~ /\/\d$/
         set_json_data_response(response: data)
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error creating the user:', code: 500)

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

@@ -23,6 +23,8 @@ module VulnAttemptServlet
       begin
         sanitized_params = sanitize_params(params)
         data = get_db.vuln_attempts(sanitized_params)
+        # Only return the single object if the user used the resource/ID GET request
+        data = data.first if data.count == 1 && request.url =~ /\/\d$/
         set_json_data_response(response: data)
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error retrieving vuln attempts:', code: 500)

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

@@ -26,6 +26,8 @@ module VulnServlet
         sanitized_params = sanitize_params(params)
         data = get_db.vulns(sanitized_params)
         includes = [:host, :vulns_refs, :refs, :module_refs]
+        # Only return the single object if the user used the resource/ID GET request
+        data = data.first if data.count == 1 && request.url =~ /\/\d$/
         set_json_data_response(response: data, includes: includes)
       rescue => e
         print_error_and_create_response(error: e, message: 'There was an error retrieving vulns:', code: 500)

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

@@ -27,7 +27,8 @@ module WorkspaceServlet
 
           sanitized_params = sanitize_params(params)
           data = get_db.workspaces(sanitized_params)
-
+          # Only return the single object if the user used the resource/ID GET request
+          data = data.first if data.count == 1 && request.url =~ /\/\d$/
           set_json_data_response(response: data, includes: includes)
         rescue => e
           print_error_and_create_response(error: e, message: 'There was an error retrieving workspaces:', code: 500)