feat(auth): Return auth error if application is requesting a wrong org #81193
Conversation
This file contains 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
github-actions
bot
added
the
Scope: Backend
sentaur-athena
force-pushed
the
athena/launch-middleware-changes
branch
from
a09ec51
to
9c162e6
Compare
markstory
reviewed
Nov 22, 2024
| @@ -422,7 +423,7 @@ def authenticate_token(self, request: Request, token_str: str) -> tuple[Any, Any | |||
| if application_is_inactive: | |||
| raise AuthenticationFailed("UserApplication inactive or deleted") | |||
|
|
|||
| if token.organization_id: | |||
| if token.scoping_organization_id: | |||
There was a problem hiding this comment.
The SystemToken and ApiTokenReplica types don't have scoping_organization_id attributes. I think you'd need to make sure that attribute exists first.
There was a problem hiding this comment.
@markstory I added it to ApiTokenReplica below in src/sentry/auth/services/auth/serial.py
Why does SystemToken need it? 🤔
There was a problem hiding this comment.
oh got it. I need to add it to the model. But maybe skip the check for systemtoken? I don't see a case where this will used in system token at all so we want this line to skip.
There was a problem hiding this comment.
Added both in #81213
❌ 2 Tests Failed:
View the top 2 failed tests by shortest run time
To view more test analytics, go to the Test Analytics Dashboard |
sentaur-athena
changed the base branch from
master
to
athena/add-scoping-org-to-all
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.
If an application is organization scope application, their tokens will only have access to one organization of a user. So we should return auth error if:
In a previous PR I added some logging to make sure this doesn't break other integrations. It actually does, so I have to limit this to token.scoping_organization_id vs token.organization_id