From 6776229c1fcc9293e201c78610e22f9d176847f7 Mon Sep 17 00:00:00 2001 From: Yaro Shm Date: Tue, 17 Nov 2026 22:00:18 +0100 Subject: [PATCH] fix: Answer Invalid Params when tool or prompt arguments are not an object tools/call and prompts/get raised NoMethodError on a non-object arguments value, so the client got -32603 Internal error and the exception reporter saw a server fault for a client mistake. --- lib/mcp/server.rb | 12 ++++++++++++ test/mcp/server_test.rb | 23 +++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/lib/mcp/server.rb b/lib/mcp/server.rb index 4fc37f7b..250d3f1b 100644 --- a/lib/mcp/server.rb +++ b/lib/mcp/server.rb @@ -1424,6 +1424,12 @@ def call_tool(request, instrumentation_data:, session: nil, related_request_id: end arguments = request[:arguments] || {} + unless arguments.is_a?(Hash) + instrumentation_data.merge!(tool_name: tool_name, error: :invalid_params) + + raise RequestHandlerError.new("Invalid arguments: expected an object", request, error_type: :invalid_params) + end + instrumentation_data.merge!(tool_name: tool_name, tool_arguments: arguments) if tool.input_schema&.missing_required_arguments?(arguments) @@ -1512,6 +1518,12 @@ def get_prompt(request, instrumentation_data:, session: nil, related_request_id: instrumentation_data.merge!(prompt_name: prompt_name) prompt_args = request[:arguments] + unless prompt_args.nil? || prompt_args.is_a?(Hash) + instrumentation_data.merge!(error: :invalid_params) + + raise RequestHandlerError.new("Invalid arguments: expected an object", request, error_type: :invalid_params) + end + prompt.validate_arguments!(prompt_args) server_context = build_server_context( diff --git a/test/mcp/server_test.rb b/test/mcp/server_test.rb index 80460cc0..80a644c7 100644 --- a/test/mcp/server_test.rb +++ b/test/mcp/server_test.rb @@ -1398,6 +1398,18 @@ class Example < Tool assert_instrumentation_data({ method: "tools/call", tool_name: "unknown_tool", error: :invalid_params }) end + test "#handle tools/call returns invalid params when arguments is not an object" do + ["text", [1], 5].each do |arguments| + request = { jsonrpc: "2.0", method: "tools/call", params: { name: "test_tool", arguments: arguments }, id: 1 } + + response = @server.handle(request) + assert_nil response[:result] + assert_equal(-32602, response[:error][:code]) + assert_includes response[:error][:data], "Invalid arguments: expected an object" + assert_instrumentation_data({ method: "tools/call", tool_name: "test_tool", error: :invalid_params }) + end + end + test "#handle_json returns JSON-RPC error for unknown tool" do request = JSON.generate({ jsonrpc: "2.0", @@ -1470,6 +1482,17 @@ class Example < Tool assert_instrumentation_data({ method: "prompts/get", error: :prompt_not_found }) end + test "#handle prompts/get returns invalid params when arguments is not an object" do + ["text", [1]].each do |arguments| + request = { jsonrpc: "2.0", method: "prompts/get", id: 1, params: { name: "test_prompt", arguments: arguments } } + + response = @server.handle(request) + assert_equal JsonRpcHandler::ErrorCode::INVALID_PARAMS, response.dig(:error, :code) + assert_includes response[:error][:data], "Invalid arguments: expected an object" + assert_instrumentation_data({ method: "prompts/get", prompt_name: "test_prompt", error: :invalid_params }) + end + end + test "#handle prompts/get returns error if prompt arguments are invalid" do request = { jsonrpc: "2.0",