fix(mcp): replace TOCTOU race in Session.Initialize with sync.Once - #6
Merged
Merged
Conversation
The previous memoisation used check-unlock-call-lock, which left a window where two goroutines could both observe initDone==false, release the lock, and enter handshake() concurrently. The second call's result would overwrite the first's, and notifications/initialized could be sent twice. Replace initDone bool with sync.Once: the Do block runs exactly once regardless of concurrency, eliminating the race without changing the observable behaviour for sequential callers.
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.
Problem
Session.Initializeused a check-unlock-call-lock pattern for memoisation:Two goroutines that both observe
initDone == falsebefore the unlock can both enterhandshake()concurrently. The second call's result overwrites the first's, andnotifications/initializedcan be sent twice — which violates the MCP spec and may confuse servers that track notification state.Fix
Replace
initDone boolwithsync.Once. TheDoblock runs exactly once regardless of how many goroutines callInitializesimultaneously:Observable behaviour for sequential callers is identical.
syncis already imported.