Skip to content

Commit 0290d53

Browse files
committed
Name supported protocol versions when rejecting legacy initialize
1 parent 615a88b commit 0290d53

4 files changed

Lines changed: 83 additions & 0 deletions

File tree

‎mcp-core/src/main/java/io/modelcontextprotocol/modern/server/McpServer.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,15 @@ private Mono<McpTransportResponse> handle(McpTransportContext transportContext,
125125
private Mono<McpTransportResponse> dispatch(McpTransportContext transportContext, JSONRPCRequest request,
126126
boolean blocking) {
127127
Object id = request.id();
128+
if ("initialize".equals(request.method())) {
129+
Object version = request.params() instanceof Map<?, ?> params ? params.get("protocolVersion") : null;
130+
String requested = version instanceof String s ? s : null;
131+
return error(id,
132+
new JSONRPCError(ErrorCodes.INVALID_PARAMS,
133+
"Unsupported protocol version: " + requested + ". Supported versions: "
134+
+ String.join(", ", this.supportedVersions),
135+
new UnsupportedProtocolVersionData(this.supportedVersions, requested)));
136+
}
128137
if (request.params() == null) {
129138
return invalidParams(id, "params is required");
130139
}

‎mcp-core/src/main/java/io/modelcontextprotocol/modern/server/transport/HttpServletMcpTransport.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,11 @@ private void writeJson(HttpServletResponse response, int status, JSONRPCResponse
383383
* consistent with the body
384384
*/
385385
private String validateHeaders(HttpServletRequest request, JSONRPCRequest jsonRpcRequest) {
386+
if ("initialize".equals(jsonRpcRequest.method())) {
387+
// Let the request manager reject legacy initialization with its supported
388+
// versions.
389+
return null;
390+
}
386391
String methodHeader = request.getHeader("Mcp-Method");
387392
if (methodHeader == null) {
388393
return "Missing required header: Mcp-Method";

‎mcp-core/src/test/java/io/modelcontextprotocol/modern/server/transport/StdioMcpTransportTests.java‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import io.modelcontextprotocol.modern.JsonRpc.JSONRPCNotification;
3838
import io.modelcontextprotocol.modern.JsonRpc.JSONRPCRequest;
3939
import io.modelcontextprotocol.modern.JsonRpc.JSONRPCResponse;
40+
import io.modelcontextprotocol.modern.McpSchema;
4041
import io.modelcontextprotocol.modern.McpSchema.CacheScope;
4142
import io.modelcontextprotocol.modern.McpSchema.ErrorCodes;
4243
import io.modelcontextprotocol.modern.server.McpTransportResponse;
@@ -45,9 +46,12 @@
4546
import io.modelcontextprotocol.modern.server.feature.McpChangePublisher;
4647
import io.modelcontextprotocol.modern.server.feature.ServerChange;
4748
import io.modelcontextprotocol.modern.server.feature.ToolsFeature;
49+
import io.modelcontextprotocol.spec.ProtocolVersions;
4850
import io.modelcontextprotocol.spec.json.gson.GsonMcpJsonMapper;
4951
import org.junit.jupiter.api.AfterEach;
5052
import org.junit.jupiter.api.Test;
53+
import org.junit.jupiter.params.ParameterizedTest;
54+
import org.junit.jupiter.params.provider.ValueSource;
5155
import reactor.core.publisher.Flux;
5256
import reactor.core.publisher.Mono;
5357
import reactor.core.publisher.Sinks;
@@ -150,6 +154,49 @@ public Mono<Void> handleNotification(McpTransportContext transportContext,
150154
};
151155
}
152156

157+
@Test
158+
void legacyInitializeErrorNamesSupportedVersions() throws Exception {
159+
List<String> supportedVersions = List.of(McpSchema.LATEST_PROTOCOL_VERSION, "2099-01-01");
160+
McpServer server = McpServer.builder()
161+
.serverInfo(SERVER_INFO)
162+
.jsonMapper(this.jsonMapper)
163+
.supportedVersions(supportedVersions)
164+
.build();
165+
start(server);
166+
167+
send("initialize", 1, Map.of("protocolVersion", ProtocolVersions.MCP_2025_11_25, "capabilities", Map.of(),
168+
"clientInfo", Map.of("name", "legacy-client", "version", "1.0.0")));
169+
170+
Map<String, Object> response = this.jsonMapper.readValue(readLineWithTimeout(), Map.class);
171+
assertThat(((Number) response.get("id")).intValue()).isEqualTo(1);
172+
assertThat(errorCode(response)).isEqualTo(ErrorCodes.INVALID_PARAMS);
173+
Map<?, ?> error = (Map<?, ?>) response.get("error");
174+
assertThat(error.get("message")).isEqualTo("Unsupported protocol version: " + ProtocolVersions.MCP_2025_11_25
175+
+ ". Supported versions: " + String.join(", ", supportedVersions));
176+
Map<?, ?> data = (Map<?, ?>) error.get("data");
177+
assertThat(data.get("supported")).isEqualTo(supportedVersions);
178+
assertThat(data.get("requested")).isEqualTo(ProtocolVersions.MCP_2025_11_25);
179+
}
180+
181+
@ParameterizedTest
182+
@ValueSource(strings = { "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"initialize\"}",
183+
"{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"initialize\",\"params\":{}}",
184+
"{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"initialize\",\"params\":{\"protocolVersion\":42}}" })
185+
void legacyInitializeWithoutRequestedVersionStillNamesSupportedVersions(String request) throws Exception {
186+
start(McpServer.builder().serverInfo(SERVER_INFO).jsonMapper(this.jsonMapper).build());
187+
188+
sendRaw(request);
189+
190+
Map<String, Object> response = this.jsonMapper.readValue(readLineWithTimeout(), Map.class);
191+
assertThat(((Number) response.get("id")).intValue()).isEqualTo(1);
192+
assertThat(errorCode(response)).isEqualTo(ErrorCodes.INVALID_PARAMS);
193+
Map<?, ?> error = (Map<?, ?>) response.get("error");
194+
assertThat((String) error.get("message")).contains(McpSchema.LATEST_PROTOCOL_VERSION);
195+
Map<?, ?> data = (Map<?, ?>) error.get("data");
196+
assertThat(data.get("supported")).isEqualTo(List.of(McpSchema.LATEST_PROTOCOL_VERSION));
197+
assertThat(data.get("requested")).isNull();
198+
}
199+
153200
@Test
154201
void fastRequestIsNotBlockedByASlowerConcurrentOne() throws Exception {
155202
CountDownLatch slowStarted = new CountDownLatch(1);

‎mcp-test/src/test/java/io/modelcontextprotocol/modern/server/transport/HttpServletMcpTransportIntegrationTests.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import io.modelcontextprotocol.modern.server.feature.ToolsPage;
4545
import io.modelcontextprotocol.server.transport.DefaultServerTransportSecurityValidator;
4646
import io.modelcontextprotocol.server.transport.TomcatTestUtil;
47+
import io.modelcontextprotocol.spec.ProtocolVersions;
4748
import io.modelcontextprotocol.util.ToolsUtils;
4849
import org.apache.catalina.LifecycleException;
4950
import org.apache.catalina.startup.Tomcat;
@@ -170,6 +171,27 @@ private static Map<String, Object> meta() {
170171
return meta;
171172
}
172173

174+
@Test
175+
void legacyInitializeWithoutMethodHeaderErrorNamesSupportedVersions() throws Exception {
176+
Map<String, Object> params = Map.of("protocolVersion", ProtocolVersions.MCP_2025_11_25, "capabilities",
177+
Map.of(), "clientInfo", Map.of("name", "legacy-client", "version", "1.0.0"));
178+
HttpRequest request = rawPost(JSON_MAPPER
179+
.writeValueAsString(Map.of("jsonrpc", "2.0", "id", 1, "method", "initialize", "params", params)));
180+
HttpResponse<String> response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString());
181+
182+
assertThat(response.statusCode()).isEqualTo(400);
183+
Map<String, Object> parsed = JSON_MAPPER.readValue(response.body(), new TypeRef<Map<String, Object>>() {
184+
});
185+
assertThat(((Number) parsed.get("id")).intValue()).isEqualTo(1);
186+
Map<?, ?> error = (Map<?, ?>) parsed.get("error");
187+
assertThat(error.get("message")).isEqualTo("Unsupported protocol version: " + ProtocolVersions.MCP_2025_11_25
188+
+ ". Supported versions: " + McpSchema.LATEST_PROTOCOL_VERSION);
189+
Map<?, ?> data = (Map<?, ?>) error.get("data");
190+
assertThat(data.get("supported")).isEqualTo(List.of(McpSchema.LATEST_PROTOCOL_VERSION));
191+
assertThat(data.get("requested")).isEqualTo(ProtocolVersions.MCP_2025_11_25);
192+
assertThat(errorCode(response)).isEqualTo(ErrorCodes.INVALID_PARAMS);
193+
}
194+
173195
@Test
174196
void discoverReturnsSupportedVersions() throws Exception {
175197
HttpRequest request = post("server/discover", Map.of("_meta", meta())).build();

0 commit comments

Comments
 (0)