Repository navigation
Introduce mechanism for different trust material sources #48869
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
33 changes: 33 additions & 0 deletions
33
...spi-private/src/main/java/org/keycloak/broker/provider/TrustMaterialIdentityProvider.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * Copyright 2026 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.keycloak.broker.provider; | ||
|
|
||
| import java.util.stream.Stream; | ||
|
|
||
| import org.keycloak.jose.jwk.JWK; | ||
| import org.keycloak.models.IdentityProviderModel; | ||
|
|
||
| /** | ||
| * Identity providers that expose reusable trust material for flows such as | ||
| * client attestation or OID4VCI key attestation. | ||
| */ | ||
| public interface TrustMaterialIdentityProvider<C extends IdentityProviderModel> extends IdentityProvider<C> { | ||
|
|
||
| Stream<JWK> resolveKeys(TrustMaterialRequest request); | ||
|
|
||
| } |
73 changes: 73 additions & 0 deletions
73
server-spi-private/src/main/java/org/keycloak/broker/provider/TrustMaterialRequest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * Copyright 2026 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.keycloak.broker.provider; | ||
|
|
||
| public class TrustMaterialRequest { | ||
|
|
||
| private final String kid; | ||
| private final String algorithm; | ||
| private final String issuer; | ||
|
|
||
| private TrustMaterialRequest(Builder builder) { | ||
| this.kid = builder.kid; | ||
| this.algorithm = builder.algorithm; | ||
| this.issuer = builder.issuer; | ||
| } | ||
|
|
||
| public String getKid() { | ||
| return kid; | ||
| } | ||
|
|
||
| public String getAlgorithm() { | ||
| return algorithm; | ||
| } | ||
|
|
||
| public String getIssuer() { | ||
| return issuer; | ||
| } | ||
|
|
||
| public static Builder builder() { | ||
| return new Builder(); | ||
| } | ||
|
|
||
| public static class Builder { | ||
|
|
||
| private String kid; | ||
| private String algorithm; | ||
| private String issuer; | ||
|
|
||
| public Builder kid(String kid) { | ||
| this.kid = kid; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder algorithm(String algorithm) { | ||
| this.algorithm = algorithm; | ||
| return this; | ||
| } | ||
|
|
||
| public Builder issuer(String issuer) { | ||
| this.issuer = issuer; | ||
| return this; | ||
| } | ||
|
|
||
| public TrustMaterialRequest build() { | ||
| return new TrustMaterialRequest(this); | ||
| } | ||
| } | ||
| } |
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to use the per-client configuration instead of using "global" configuration at the authenticator level?
As I think that in production, realm will have different clients/wallets, but each of them may need different attestation key. For example client
my-wallet-1andmy-wallet-11may need attestations from IDPidp1, whenmy-wallet2will need attestations from IDPidp2.It should be possible to do this just by moving this config option to the method
getConfigPropertiesPerClient()instead ofgetConfigProperties(). Then in the admin console, it will appear in the client credentials tab. See screenshotAlso you can see for example
FederatedJWTClientAuthenticatorfor some "inspiration" .There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you agree with the general direction i will rework this PR to be mergeable