Validate exposedTo before registering AbortSignal algorithm - #240
Merged
domfarolino merged 2 commits intoAug 14, 2026
Merged
Conversation
Move the validation of `options.exposedTo` origins before attaching the unregister algorithm to `options.signal` in `registerTool()`. Previously, the abort algorithm was attached to the signal before origin validation. If `exposedTo` contained an invalid or untrustworthy origin, the promise was rejected with a `SecurityError`, but the abort algorithm remained attached to the signal and could inadvertently unregister a subsequently registered tool of the same name upon aborting. Also reorder `ModelContextRegisterToolOptions` dictionary members and domintro definitions to match the processing order of options.
Collaborator
|
So the only observable with this change is the buggy ability to unregister a later-registered, valid tool by the abort algorithm hanging around, right? (I think this will be fixed regardless, once we end up with a UUID-keyed tool registry and |
Collaborator
Author
Yes. |
markafoltz
reviewed
Aug 11, 2026
domfarolino
approved these changes
Aug 14, 2026
github-actions Bot
added a commit
that referenced
this pull request
Aug 14, 2026
SHA: 7aa8235 Reason: push, by domfarolino Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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
3 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.
Move the validation of
options.exposedToorigins before attaching the unregister algorithm tooptions.signalinregisterTool().Previously, the abort algorithm was attached to the signal before origin validation. If
exposedTocontained an invalid or untrustworthy origin, the promise was rejected with aSecurityError, but the abort algorithm remained attached to the signal and could inadvertently unregister a subsequently registered tool of the same name upon aborting.Also reorder
ModelContextRegisterToolOptionsdictionary members and domintro definitions to match the processing order of options.Fixed in Chromium: https://chromium-review.googlesource.com/c/chromium/src/+/8236351
Preview | Diff