Skip to content

Fix invalid initialize request handling #1709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lntutor wants to merge 1 commit into
base: main
Choose a base branch
from
+35 −0
Open

Fix invalid initialize request handling #1709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions src/ModelContextProtocol.AspNetCore/StreamableHttpHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ internal sealed class StreamableHttpHandler(

private static readonly JsonTypeInfo<JsonRpcMessage> s_messageTypeInfo = GetRequiredJsonTypeInfo<JsonRpcMessage>();
private static readonly JsonTypeInfo<JsonRpcError> s_errorTypeInfo = GetRequiredJsonTypeInfo<JsonRpcError>();
private static readonly JsonTypeInfo<InitializeRequestParams> s_initializeRequestParamsTypeInfo = GetRequiredJsonTypeInfo<InitializeRequestParams>();

private static bool AllowNewSessionForNonInitializeRequests { get; } =
AppContext.TryGetSwitch("ModelContextProtocol.AspNetCore.AllowNewSessionForNonInitializeRequests", out var enabled) && enabled;
Expand Down Expand Up @@ -116,6 +117,21 @@ await WriteJsonRpcErrorAsync(context,
return;
}

if (message is JsonRpcRequest { Method: RequestMethods.Initialize } initializeRequest)
{
try
{
JsonSerializer.Deserialize(initializeRequest.Params, s_initializeRequestParamsTypeInfo);
}
catch (JsonException ex)
{
await WriteJsonRpcErrorAsync(context,
$"Bad Request: The initialize request parameters were invalid. {ex.Message}",
StatusCodes.Status400BadRequest, (int)McpErrorCode.InvalidParams, requestId);
return;
}
}

var session = await GetOrCreateSessionAsync(context, message, requestId);
if (session is null)
{
Expand Down
19 changes: 19 additions & 0 deletions tests/ModelContextProtocol.AspNetCore.Tests/StreamableHttpServerConformanceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,25 @@ public async Task PostMalformedJson_Returns400_InvalidRequest_WithNullId()
Assert.Equal((int)McpErrorCode.InvalidRequest, doc.RootElement.GetProperty("error").GetProperty("code").GetInt32());
}

[Fact]
public async Task InitializeWithMissingClientVersion_Returns400_InvalidParams_WithRequestId()
{
await StartAsync();

const string request = """
{"jsonrpc":"2.0","id":7,"method":"initialize","params":{"protocolVersion":"2025-03-26","capabilities":{},"clientInfo":{"name":"IntegrationTestClient"}}}
""";

using var response = await HttpClient.PostAsync("", JsonContent(request), TestContext.Current.CancellationToken);
Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
Assert.False(response.Headers.Contains("mcp-session-id"));

using var doc = JsonDocument.Parse(await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken));
Assert.Equal(7, doc.RootElement.GetProperty("id").GetInt64());
Assert.Equal((int)McpErrorCode.InvalidParams, doc.RootElement.GetProperty("error").GetProperty("code").GetInt32());
Assert.Contains("version", doc.RootElement.GetProperty("error").GetProperty("message").GetString(), StringComparison.OrdinalIgnoreCase);
}

[Fact]
public async Task PostRequestWithExplicitNullId_Returns400_InvalidRequest_WithNullId()
{
Expand Down