diff --git a/lib/mcp/server.rb b/lib/mcp/server.rb index c117af7d..4fc37f7b 100644 --- a/lib/mcp/server.rb +++ b/lib/mcp/server.rb @@ -824,6 +824,7 @@ def handle_request(request, method, session: nil, related_request_id: nil, auth_ when Methods::INITIALIZE init(params, session: session) when Methods::RESOURCES_READ + validate_resource_read_params!(params) contents = read_resource_contents(params, instrumentation_data: instrumentation_data, session: session, related_request_id: related_request_id, cancellation: cancellation, envelope: envelope, auth_info: auth_info) # An SEP-2322 `input_required` result must not be wrapped as `contents` or stamped with SEP-2549 cache hints. @@ -1286,6 +1287,12 @@ def init(params, session: nil) }.compact end + def validate_resource_read_params!(params) + unless params.is_a?(Hash) && params[:uri].is_a?(String) + raise RequestHandlerError.new("Missing or invalid uri", params, error_type: :invalid_params) + end + end + def validate_resource_subscription_params!(params) unless params.is_a?(Hash) && params[:uri].is_a?(String) raise RequestHandlerError.new("Missing or invalid uri", params, error_type: :invalid_params) diff --git a/test/mcp/server_test.rb b/test/mcp/server_test.rb index b9f4aa08..80460cc0 100644 --- a/test/mcp/server_test.rb +++ b/test/mcp/server_test.rb @@ -1764,6 +1764,100 @@ def read_resource_request(uri) assert_equal "handler wins", response[:result][:contents].first[:text] end + test "#handle resources/read without uri returns -32602" do + response = @server.handle({ jsonrpc: "2.0", method: "resources/read", id: 1, params: {} }) + + assert_equal(-32602, response[:error][:code]) + assert_equal "Invalid params", response[:error][:message] + assert_includes response[:error][:data], "uri" + end + + test "#handle resources/read without params returns -32602" do + response = @server.handle({ jsonrpc: "2.0", method: "resources/read", id: 1 }) + + assert_equal(-32602, response[:error][:code]) + assert_equal "Invalid params", response[:error][:message] + end + + test "#handle resources/read with a non-string uri returns -32602 when class-based resources are registered" do + server = Server.new(name: "test_server", resources: [GreetingResource]) + + response = server.handle(read_resource_request(123)) + + assert_equal(-32602, response[:error][:code]) + assert_equal "Invalid params", response[:error][:message] + assert_includes response[:error][:data], "uri" + end + + test "#handle resources/read without uri does not invoke a custom handler" do + handler_called = false + @server.resources_read_handler do |_request| + handler_called = true + [] + end + + response = @server.handle({ jsonrpc: "2.0", method: "resources/read", id: 1, params: {} }) + + assert_equal(-32602, response[:error][:code]) + refute handler_called + end + + test "#handle resources/read with a non-string uri returns -32602 when class-based templates are registered" do + server = Server.new(name: "test_server", resource_templates: [UserProfileTemplate]) + + response = server.handle(read_resource_request(123)) + + assert_equal(-32602, response[:error][:code]) + assert_equal "Invalid params", response[:error][:message] + assert_includes response[:error][:data], "uri" + end + + test "#handle resources/read with params that are not an object returns -32602" do + response = @server.handle({ jsonrpc: "2.0", method: "resources/read", id: 1, params: [] }) + + assert_equal(-32602, response[:error][:code]) + assert_equal "Invalid params", response[:error][:message] + end + + test "#handle resources/read with a null uri returns -32602 when class-based templates are registered" do + server = Server.new(name: "test_server", resource_templates: [UserProfileTemplate]) + + response = server.handle(read_resource_request(nil)) + + assert_equal(-32602, response[:error][:code]) + assert_equal "Invalid params", response[:error][:message] + assert_includes response[:error][:data], "uri" + end + + test "#handle resources/read with a non-string uri does not invoke a custom handler" do + handler_called = false + @server.resources_read_handler do |_request| + handler_called = true + [] + end + + response = @server.handle(read_resource_request(123)) + + assert_equal(-32602, response[:error][:code]) + assert_equal "Invalid params", response[:error][:message] + refute handler_called + end + + test "#handle resources/read without uri returns -32602 for a modern request" do + handler_called = false + @server.resources_read_handler do |_request| + handler_called = true + [] + end + + response = @server.handle(modern_request("resources/read", {})) + + assert_equal(-32602, response[:error][:code]) + assert_equal "Invalid params", response[:error][:message] + assert_includes response[:error][:data], "uri" + refute handler_called + end + test "#handle resources/list and resources/templates/list render class-based and instance-based entries together" do server = Server.new( name: "test_server",