chore: Move scope into the same auth call #4162
Merged
Conversation
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
Emyrk
commented
Sep 23, 2022
Comment on lines
+147
to
+170
| if len(results) == 1 && len(results[0].Bindings) == 2 { | ||
| roleCheck, ok := results[0].Bindings[rolesOkCheck].(bool) | ||
| if !ok || !roleCheck { | ||
| return ForbiddenWithInternal(xerrors.Errorf("policy disallows request"), input, results) | ||
| } | ||
|
|
||
| return nil | ||
| scopeCheck, ok := results[0].Bindings[scopeOkCheck].(bool) | ||
| if !ok || !scopeCheck { | ||
| return ForbiddenWithInternal(xerrors.Errorf("policy disallows request"), input, results) | ||
| } | ||
|
|
||
| // This is purely defensive programming. The two above checks already | ||
| // check for 'true' expressions. This is just a sanity check to make | ||
| // sure we don't add non-boolean expressions to our query. | ||
| // This is super cheap to do, and just adds in some extra safety for | ||
| // programmer error. | ||
| for _, exp := range results[0].Expressions { | ||
| if b, ok := exp.Value.(bool); !ok || !b { | ||
| return ForbiddenWithInternal(xerrors.Errorf("policy disallows request"), input, results) | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
| return ForbiddenWithInternal(xerrors.Errorf("policy disallows request"), input, results) |
There was a problem hiding this comment.
Changed the query to 2 bindings, so can't use the easy Allowed() anymore 🤷
johnstcn
approved these changes
Sep 23, 2022
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.
What this does
Does the scope authorize alongside the regular roles, rather than calling
Authorizetwice.