From ae20f73676b75ba7b8cb81ef1aeee8568967a684 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 21 Sep 2020 12:14:33 -0400 Subject: [PATCH] Update com.nimbusds dependencies to latest.release Issue gh-113 --- gradle/dependency-management.gradle | 4 ++-- .../security/oauth2/jose/jws/NimbusJwsEncoder.java | 3 +-- .../oauth2/server/authorization/web/JwkSetEndpointFilter.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 945571f..478da46 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -24,8 +24,8 @@ dependencyManagement { } dependencies { - dependency "com.nimbusds:oauth2-oidc-sdk:8.+" - dependency "com.nimbusds:nimbus-jose-jwt:8.+" + dependency "com.nimbusds:oauth2-oidc-sdk:latest.release" + dependency "com.nimbusds:nimbus-jose-jwt:latest.release" dependency "com.fasterxml.jackson.core:jackson-databind:2.+" dependency "javax.servlet:javax.servlet-api:4.+" dependency 'junit:junit:latest.release' diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoder.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoder.java index 2eb6c97..5cc7776 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoder.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoder.java @@ -28,7 +28,6 @@ import com.nimbusds.jose.util.Base64; import com.nimbusds.jose.util.Base64URL; import com.nimbusds.jwt.JWTClaimsSet; import com.nimbusds.jwt.SignedJWT; -import net.minidev.json.JSONObject; import org.springframework.core.convert.converter.Converter; import org.springframework.security.crypto.keys.KeyManager; import org.springframework.security.crypto.keys.ManagedKey; @@ -213,7 +212,7 @@ public final class NimbusJwsEncoder implements JwtEncoder { Map jwk = headers.getJwk(); if (!CollectionUtils.isEmpty(jwk)) { try { - builder.jwk(JWK.parse(new JSONObject(jwk))); + builder.jwk(JWK.parse(jwk)); } catch (Exception ex) { throw new JwtEncodingException(String.format( ENCODING_ERROR_MESSAGE_TEMPLATE, diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/JwkSetEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/JwkSetEndpointFilter.java index f17c8da..e2f8a52 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/JwkSetEndpointFilter.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/JwkSetEndpointFilter.java @@ -95,7 +95,7 @@ public class JwkSetEndpointFilter extends OncePerRequestFilter { response.setContentType(MediaType.APPLICATION_JSON_VALUE); try (Writer writer = response.getWriter()) { - writer.write(jwkSet.toJSONObject().toString()); + writer.write(jwkSet.toString()); } }