Use mutex-protected session_exists? in handle_regular_request#258
Merged
koic merged 1 commit intomodelcontextprotocol:mainfrom Mar 18, 2026
Merged
Conversation
## Motivation and Context `handle_regular_request` was checking `@sessions.key?(session_id)` directly without holding `@mutex`, while concurrent threads could modify `@sessions` via `cleanup_session` or `handle_delete`. This created a TOCTOU race where the check could pass but the session could be deleted before subsequent use. The class already provides a mutex-protected `session_exists?` helper, and `handle_get` already uses it. This change makes `handle_regular_request` consistent with `handle_get`. ## How Has This Been Tested? Added a test that verifies `handle_regular_request` delegates to the mutex-protected `session_exists?` helper instead of accessing `@sessions` directly. All existing tests pass. ## Breaking Change None.
koic
force-pushed
the
use_mutex_protected_session_exists_predicate
branch
from
526d643 to
be1bbc2
Compare
atesgoral
approved these changes
Mar 18, 2026
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
2 participants
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.
Motivation and Context
handle_regular_requestwas checking@sessions.key?(session_id)directly without holding@mutex, while concurrent threads could modify@sessionsviacleanup_sessionorhandle_delete. This created a TOCTOU race where the check could pass but the session could be deleted before subsequent use.The class already provides a mutex-protected
session_exists?helper, andhandle_getalready uses it. This change makeshandle_regular_requestconsistent withhandle_get.How Has This Been Tested?
Added a test that verifies
handle_regular_requestdelegates to the mutex-protectedsession_exists?helper instead of accessing@sessionsdirectly.All existing tests pass.
Breaking Change
None.
Types of changes
Checklist
Additional context