Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/malformed-resource-uri-invalid-params.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@modelcontextprotocol/server': patch
---

Return JSON-RPC Invalid Params with the original URI and an `invalid_uri` reason when `resources/read` receives a syntactically malformed URI.
10 changes: 9 additions & 1 deletion packages/server/src/server/mcp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,15 @@ export class McpServer {
});

this.server.setRequestHandler('resources/read', async (request, ctx) => {
const uri = new URL(request.params.uri);
let uri: URL;
try {
uri = new URL(request.params.uri);
} catch {
throw new ProtocolError(ProtocolErrorCode.InvalidParams, `Resource URI ${request.params.uri} is invalid`, {
uri: request.params.uri,
reason: 'invalid_uri'
});
}

// First check for exact resource match
const resource = this._registeredResources[uri.toString()];
Expand Down
74 changes: 74 additions & 0 deletions test/integration/test/server/mcp.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2743,6 +2743,80 @@ describe('Zod v4', () => {
});
});

test('should echo the exact requested URI for nonexistent resources', async () => {
const mcpServer = new McpServer({
name: 'test server',
version: '1.0'
});
const client = new Client({
name: 'test client',
version: '1.0'
});
const requestedUri = 'HTTP://example.com:80/docs/../missing file.txt';
mcpServer.registerResource('test', 'test://resource', {}, async () => ({
contents: [
{
uri: 'test://resource',
text: 'Test content'
}
]
}));

const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();

await Promise.all([client.connect(clientTransport), mcpServer.server.connect(serverTransport)]);

await expect(
client.request({
method: 'resources/read',
params: {
uri: requestedUri
}
})
).rejects.toMatchObject({
code: ProtocolErrorCode.InvalidParams,
message: expect.stringContaining('not found'),
data: { uri: requestedUri }
});
});

test('should return invalid params for syntactically invalid resource URIs', async () => {
const mcpServer = new McpServer({
name: 'test server',
version: '1.0'
});
const client = new Client({
name: 'test client',
version: '1.0'
});
const requestedUri = 'not a valid URI';
mcpServer.registerResource('test', 'test://resource', {}, async () => ({
contents: [
{
uri: 'test://resource',
text: 'Test content'
}
]
}));

const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();

await Promise.all([client.connect(clientTransport), mcpServer.server.connect(serverTransport)]);

await expect(
client.request({
method: 'resources/read',
params: {
uri: requestedUri
}
})
).rejects.toMatchObject({
code: ProtocolErrorCode.InvalidParams,
message: expect.stringContaining('invalid'),
data: { uri: requestedUri, reason: 'invalid_uri' }
});
});

/***
* Test: ProtocolError for Disabled Resource
*/
Expand Down
Loading