Skip to content

Fix #275: Reject uninitialized session requests with INVALID_REQUEST #1069

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
tanujkapoor-cmd wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −2
Open

Fix #275: Reject uninitialized session requests with INVALID_REQUEST #1069

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
14 changes: 12 additions & 2 deletions mcp-core/src/main/java/io/modelcontextprotocol/spec/McpServerSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,12 @@ private Mono<McpSchema.JSONRPCResponse> handleIncomingRequest(McpSchema.JSONRPCR
resultMono = this.initRequestHandler.handle(initializeRequest);
}
else {
// TODO handle errors for communication to this session without
// initialization happening first
if (this.state.get() != STATE_INITIALIZED) {
logger.warn("Rejecting uninitialized request method: {}", request.method());
return Mono.just(McpSchema.JSONRPCResponse.error(request.id(),
new McpSchema.JSONRPCResponse.JSONRPCError(McpSchema.ErrorCodes.INVALID_REQUEST,
"Session is not initialized. Cannot process method: " + request.method(), null)));
}
var handler = this.requestHandlers.get(request.method());
if (handler == null) {
MethodNotFoundError error = getMethodNotFoundError(request.method());
Expand Down Expand Up @@ -327,6 +331,12 @@ private Mono<Void> handleIncomingNotification(McpSchema.JSONRPCNotification noti
exchangeSink.tryEmitValue(new McpAsyncServerExchange(this.id, this, clientCapabilities.get(),
clientInfo.get(), transportContext, this.jsonSchemaValidator));
}
else if (this.state.get() != STATE_INITIALIZED) {
logger.warn("Rejecting uninitialized notification method: {}", notification.method());
return Mono
.error(new McpError(new McpSchema.JSONRPCResponse.JSONRPCError(McpSchema.ErrorCodes.INVALID_REQUEST,
"Session is not initialized. Cannot process method: " + notification.method(), null)));
}

var handler = notificationHandlers.get(notification.method());
if (handler == null) {
Expand Down