fix(mcp): skip org fetch for project-scoped tokens#60234
Merged
Conversation
Contributor
|
Reviews (1): Last reviewed commit: "fix(mcp): skip org fetch for project-sco..." | Re-trigger Greptile |
Contributor
|
Size Change: 0 B Total Size: 80.2 MB ℹ️ View Unchanged
|
joshsny
approved these changes
May 27, 2026
webjunkie
pushed a commit
that referenced
this pull request
May 27, 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.
Problem
MCP can authenticate with OAuth tokens that are scoped to a single project. Those tokens can still carry broad read scopes, but backend permissions reject non-project-nested organization endpoints when
scoped_teamsis set.StateManager.getCachedOrFetchOrg()only checked fororganization:read, so session and environment resolution could still call/api/organizations/{id}/with a project-scoped token and receive a permission denial.Changes
scoped_teams.organization:read.organization:reador*.How did you test this code?
Agent-authored change. Automated tests run:
Publish to changelog?
do not publish to changelog
Docs update
No docs update. This is internal MCP authentication behavior.
🤖 Agent context
Codex CLI authored this PR using local repository inspection and terminal commands.
I inspected the current personal API key, OAuth token, MCP state resolution, and backend permission flows. I chose an MCP-side guard rather than changing OAuth token issuance so project-scoped sandbox isolation remains intact. The implementation mirrors backend permissions by avoiding non-project-nested organization fetches for project-scoped tokens while keeping the existing scope-based behavior for other tokens.