mcp: keep request log levels scoped to each request - #1168
Open
jstar0 wants to merge 1 commit into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes a request-scoping bug in the new-protocol logging path.
ServerSession.handledecoded_meta[io.modelcontextprotocol/logLevel], but stored it inServerSessionState.LogLevel. Concurrent new-protocol requests on the same session could therefore clear or inherit another request's log threshold before the original handler emitted logs.This keeps the new-protocol log level on the handler context instead.
ServerSession.LogandLoggingHandler.Enabledread that context value first, while legacylogging/setLevelbehavior still uses session state.Tests:
go test ./mcp -run TestServerLogLevelDoesNotLeakBetweenNewProtocolRequests -count=1go test -race ./mcp -run TestServerLogLevelDoesNotLeakBetweenNewProtocolRequests -count=1go test ./mcp -run TestEndToEnd -count=1go test ./mcp -run TestValidateRequestMeta -count=1go test ./mcp -run TestStreamableStateless_NewProtocolSession_NoFakeInit -count=1go test ./... -skip TestSSELocalhostProtection|TestStreamableLocalhostProtectionA full
go test ./...run in my local environment still fails the two localhost protection cases for0.0.0.0 via localhost rejects evil.com; those same two tests also fail when run directly and are unrelated to this logging change.