Make sure internal claims are filtered out from claim_token and claims from tickets have precedence - #51425
Open
pedroigor wants to merge 1 commit into
Open
Make sure internal claims are filtered out from claim_token and claims from tickets have precedence#51425pedroigor wants to merge 1 commit into
pedroigor wants to merge 1 commit into
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Hardens UMA claim handling against internal-claim spoofing and ensures ticket claims take precedence.
Changes:
- Filters untrusted
kc.*claims. - Merges claims with ticket precedence.
- Adds security and precedence regression tests.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
EntitlementAPITest.java |
Adds UMA claim security tests. |
PolicyProviderFactory |
Registers the test policy provider. |
ClaimAttributePolicyProvider.java |
Adds claim-based test policy support. |
DefaultEvaluationContext.java |
Initializes and filters context attributes. |
AuthorizationTokenService.java |
Refactors claim handling and precedence. |
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 7 out of 7 changed files in this pull request and generated no new comments.
Suppressed comments (1)
testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authorization/ClaimAttributePolicyProvider.java:16
testsuite/DEPRECATED.md:12permits adding bug-fix cases to existing tests but explicitly disallows new files in the deprecated testsuite. Please implement this assertion by extending/reusing an existing provider, or move the regression coverage to the new Test Framework rather than adding this provider file.
public class ClaimAttributePolicyProvider implements PolicyProviderFactory<PolicyRepresentation>, PolicyProvider {
sguilhen
suggested changes
Aug 4, 2026
sguilhen
approved these changes
Aug 5, 2026
rmartinc
previously approved these changes
Aug 6, 2026
pedroigor
enabled auto-merge (rebase)
August 6, 2026 18:55
… from tickets have precedence Closes keycloak#51379 Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 7 out of 7 changed files in this pull request and generated no new comments.
Suppressed comments (1)
testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authorization/ClaimAttributePolicyProvider.java:1
- This adds a new file under the deprecated Arquillian testsuite, which
testsuite/DEPRECATED.md:12explicitly prohibits. Move this regression coverage and its policy provider to the new test framework undertests/, or reuse an existing provider without adding a testsuite file.
package org.keycloak.testsuite.authorization;
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.
Closes #51379