Repository navigation
Compliant with RFC8414, return server metadata at /.well-known/oauth-authorization-server/realms/{realm} #41440
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
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
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
73 changes: 73 additions & 0 deletions
73
services/src/main/java/org/keycloak/services/resources/ServerMetadataResource.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 2025 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.services.resources; | ||
|
|
||
| import jakarta.ws.rs.GET; | ||
| import jakarta.ws.rs.NotFoundException; | ||
| import jakarta.ws.rs.OPTIONS; | ||
| import jakarta.ws.rs.Path; | ||
| import jakarta.ws.rs.PathParam; | ||
| import jakarta.ws.rs.Produces; | ||
| import jakarta.ws.rs.core.Context; | ||
| import jakarta.ws.rs.core.MediaType; | ||
| import jakarta.ws.rs.core.Response; | ||
| import jakarta.ws.rs.core.UriBuilder; | ||
| import jakarta.ws.rs.ext.Provider; | ||
| import org.jboss.logging.Logger; | ||
| import org.keycloak.models.KeycloakSession; | ||
| import org.keycloak.protocol.oauth2.OAuth2WellKnownProviderFactory; | ||
| import org.keycloak.services.cors.Cors; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @Provider | ||
| @Path("/.well-known") | ||
| public class ServerMetadataResource { | ||
|
|
||
| protected static final Logger logger = Logger.getLogger(ServerMetadataResource.class); | ||
|
|
||
| @Context | ||
| protected KeycloakSession session; | ||
|
|
||
| @OPTIONS | ||
| @Path("{provider}/realms/{realm}") | ||
| @Produces(MediaType.APPLICATION_JSON) | ||
| public Response getOAuth2AuthorizationServerWellKnownVersionPreflight(final @PathParam("provider") String providerName, | ||
| final @PathParam("realm") String name) { | ||
| if (!isValidProvider(providerName)) throw new NotFoundException(); | ||
| return Cors.builder().allowedMethods("GET").preflight().auth().add(Response.ok()); | ||
| } | ||
|
|
||
| @GET | ||
| @Path("{provider}/realms/{realm}") | ||
| @Produces(MediaType.APPLICATION_JSON) | ||
| public Response getOAuth2AuthorizationServerWellKnown(final @PathParam("provider") String providerName, | ||
| final @PathParam("realm") String name) { | ||
| if (!isValidProvider(providerName)) throw new NotFoundException(); | ||
| return RealmsResource.getWellKnownResponse(session, name, providerName, logger); | ||
| } | ||
|
|
||
| public static UriBuilder wellKnownOAuthProviderUrl(UriBuilder builder) { | ||
| return builder.path(ServerMetadataResource.class).path("{provider}/realms/{realm}"); | ||
| } | ||
|
|
||
| private boolean isValidProvider(String providerName) { | ||
| // you can add codes here considering the current status of the implementation (preview, experimental). | ||
| if (OAuth2WellKnownProviderFactory.PROVIDER_ID.equals(providerName)) return true; | ||
| return false; | ||
| } | ||
| } |
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
37 changes: 37 additions & 0 deletions
37
...c/test/java/org/keycloak/testsuite/oauth/RFC8414CompliantOAuth2WellKnownProviderTest.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,37 @@ | ||
| /* | ||
| * Copyright 2025 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.testsuite.oauth; | ||
|
|
||
| import jakarta.ws.rs.core.UriBuilder; | ||
| import org.keycloak.protocol.oauth2.OAuth2WellKnownProviderFactory; | ||
| import org.keycloak.services.resources.ServerMetadataResource; | ||
| import org.keycloak.testsuite.oidc.AbstractWellKnownProviderTest; | ||
|
|
||
| import java.net.URI; | ||
|
|
||
| public class RFC8414CompliantOAuth2WellKnownProviderTest extends AbstractWellKnownProviderTest { | ||
|
|
||
| protected String getWellKnownProviderId() { | ||
| return OAuth2WellKnownProviderFactory.PROVIDER_ID; | ||
| } | ||
|
|
||
| protected URI getOIDCDiscoveryUri(UriBuilder builder) { | ||
| return ServerMetadataResource.wellKnownOAuthProviderUrl(builder).build(this.getWellKnownProviderId(), "test"); | ||
| } | ||
|
|
||
| } |
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
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.
Hello @tnorimat - I am jumping in because a very identical change is required by OpenID4VCI Draft 16 as we will need
/.well-known/openid-credential-issuer/realms/{realm}.https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0-16.html#name-credential-issuer-metadata-
Could this PR take into account extensibility regarding well-known resources in general? I mean something close to the suggestion of @thomasdarimont here: https://cloud-native.slack.com/archives/C05KR0TL4P8/p1752669894360769?thread_ts=1752669762.102799&cid=C05KR0TL4P8 ?
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.
@IngridPuppet Hello, thank you for the feedback comment. I will incorporate the extensibility you suggested.