Fixed apitoken permission check by correctly parsing the permissions#2196
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR fixes API token permission validation by distinguishing between legacy user JWT scopes and modern API-token scopes, using the JWT aud claim to choose the correct parsing strategy.
Changes:
- Pass JWT
audthrough the request lifecycle and into permission validation. - Update
validatePermissions()to parse permissions differently foruser_hashtopolis(legacy mapping) vsapi_hashtopolis(modern boolean-permission dict). - Update callers to provide the new
audargument when validating permissions.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
src/inc/apiv2/common/AbstractBaseAPI.php |
Extends permission validation to accept aud and parse legacy vs modern scopes appropriately. |
src/inc/apiv2/auth/JWTBeforeHandler.php |
Adds aud to request attributes so downstream permission checks can interpret scopes correctly. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+29
to
+30
| return $request->withAttribute("userId", $arguments["decoded"]["userId"])->withAttribute("scope", $arguments["decoded"]["scope"]) | ||
| ->withAttribute("aud", $arguments["decoded"]["aud"]); |
s3inlc
approved these changes
Jun 3, 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
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.
No description provided.