Skip to content

Accept JSON on OAuth JWK endpoint #117

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.

Sign up for GitHub

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

Open
unity-idm-agent wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Accept JSON on OAuth JWK endpoint #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3156f18
Accept JSON on OAuth JWK endpoint
unity-idm-agent Jul 14, 2026
7785af0
fix: preserve OAuth client error responses
unity-idm-agent Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion oauth/src/main/java/pl/edu/icm/unity/oauth/as/token/KeysResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;

import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.jose.JWSAlgorithm.Family;
Expand Down Expand Up @@ -45,7 +46,7 @@ public KeysResource(OAuthASProperties config)

@Path("/")
@GET
@Produces(JWKSet.MIME_TYPE)
@Produces({JWKSet.MIME_TYPE, MediaType.APPLICATION_JSON})
public String getKeys()
{
if (!config.getTokenSigner().isPKIEnabled())
Expand Down
6 changes: 5 additions & 1 deletion oauth/src/main/java/pl/edu/icm/unity/oauth/as/token/exception/EngineExceptionMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/
package pl.edu.icm.unity.oauth.as.token.exception;

import jakarta.ws.rs.ClientErrorException;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status;
Expand All @@ -25,7 +26,10 @@ class EngineExceptionMapper implements ExceptionMapper<Exception>

public Response toResponse(Exception ex)
{
if (ex instanceof AuthorizationException || ex instanceof AuthenticationException)
if (ex instanceof ClientErrorException)
{
return ((ClientErrorException) ex).getResponse();
} else if (ex instanceof AuthorizationException || ex instanceof AuthenticationException)
{
log.warn("Access denied for rest client", ex);
return Response.status(Status.FORBIDDEN)
Expand Down
10 changes: 10 additions & 0 deletions oauth/src/test/java/pl/edu/icm/unity/oauth/as/DiscoveryResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

import java.util.HashSet;

import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;

import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -51,6 +53,14 @@ public void testDiscovery() throws ParseException
assertEquals(7, parsed.getResponseTypes().size());
}

@Test
public void shouldProduceJWKSetAndJSON() throws NoSuchMethodException
{
Produces produces = KeysResource.class.getMethod("getKeys").getAnnotation(Produces.class);

assertThat(produces.value()).contains(JWKSet.MIME_TYPE, MediaType.APPLICATION_JSON);
}

@Test
public void testJWK() throws java.text.ParseException
{
Expand Down
25 changes: 25 additions & 0 deletions oauth/src/test/java/pl/edu/icm/unity/oauth/as/token/exception/EngineExceptionMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright (c) 2014 ICM Uniwersytet Warszawski All rights reserved.
* See LICENCE.txt file for licensing information.
*/
package pl.edu.icm.unity.oauth.as.token.exception;

import static org.assertj.core.api.Assertions.assertThat;

import jakarta.ws.rs.ClientErrorException;
import jakarta.ws.rs.core.Response;

import org.junit.jupiter.api.Test;

public class EngineExceptionMapperTest
{
@Test
public void shouldPreserveClientErrorResponse()
{
Response originalResponse = Response.status(Response.Status.NOT_ACCEPTABLE).build();

Response response = new EngineExceptionMapper().toResponse(new ClientErrorException(originalResponse));

assertThat(response.getStatus()).isEqualTo(Response.Status.NOT_ACCEPTABLE.getStatusCode());
}
}