[java-oidc-common] branch main updated: JCOMOIDC-115 - Update Nimbus oauth2-oidc-sdk into 11.11
Henri Mikkonen
henri.mikkonen at iki.fi
Wed May 22 14:23:13 UTC 2024
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-oidc-common.
View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=95f0b9e7681a90dad22cd1317a6ea76a2d8536fe
The following commit(s) were added to refs/heads/main by this push:
new 95f0b9e JCOMOIDC-115 - Update Nimbus oauth2-oidc-sdk into 11.11
95f0b9e is described below
commit 95f0b9e7681a90dad22cd1317a6ea76a2d8536fe
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed May 22 17:20:32 2024 +0300
JCOMOIDC-115 - Update Nimbus oauth2-oidc-sdk into 11.11
https://shibboleth.atlassian.net/browse/JCOMOIDC-115
- Bumped following dependencies
- nimbus-jose-jwt to 9.39.1
- oauth2-oidc-sdk to 11.11
- json.smart to 2.5.1
- nimbus.content.type to 2.3
- Removed deprecation warnings
---
.../main/java/net/shibboleth/oidc/security/JWSAssemblyUtils.java | 4 +++-
.../net/shibboleth/oidc/profile/messaging/JSONErrorResponse.java | 2 +-
.../shibboleth/oidc/profile/messaging/JSONSuccessResponse.java | 2 +-
.../profile/encoding/impl/HTTPPostAuthnRequestEncoderTest.java | 2 +-
.../oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java | 2 +-
pom.xml | 8 ++++----
6 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWSAssemblyUtils.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWSAssemblyUtils.java
index 1e785f7..58a8fa9 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWSAssemblyUtils.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWSAssemblyUtils.java
@@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import javax.annotation.Nonnull;
+import javax.crypto.spec.SecretKeySpec;
import com.nimbusds.jose.JOSEException;
import com.nimbusds.jose.JOSEObjectType;
@@ -111,7 +112,8 @@ public final class JWSAssemblyUtils {
* A null JCA provider is supplied, as a result the preferred provider that supports the specified
* algorithm will be used.
*/
- final byte[] hmac = HMAC.compute(getJCAAlgorithmName(algorithm), secret,
+ final byte[] hmac = HMAC.compute(getJCAAlgorithmName(algorithm),
+ new SecretKeySpec(secret, getJCAAlgorithmName(algorithm)),
signingInput.getBytes(StandardCharsets.UTF_8), null);
final SignedJWT signedJwt = new SignedJWT(header.toBase64URL(), payload.toBase64URL(),
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/messaging/JSONErrorResponse.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/messaging/JSONErrorResponse.java
index 5d5bc7a..cb9ffc7 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/messaging/JSONErrorResponse.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/messaging/JSONErrorResponse.java
@@ -102,7 +102,7 @@ public class JSONErrorResponse implements ErrorResponse {
if (pragma != null) {
httpResponse.setPragma(pragma);
}
- httpResponse.setContent(getContent());
+ httpResponse.setBody(getContent());
return httpResponse;
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/messaging/JSONSuccessResponse.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/messaging/JSONSuccessResponse.java
index 2bf996b..6bbbce3 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/messaging/JSONSuccessResponse.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/messaging/JSONSuccessResponse.java
@@ -94,7 +94,7 @@ public class JSONSuccessResponse implements SuccessResponse {
if (pragma != null) {
httpResponse.setPragma(pragma);
}
- httpResponse.setContent(content.toJSONString());
+ httpResponse.setBody(content.toJSONString());
return httpResponse;
}
}
diff --git a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/encoding/impl/HTTPPostAuthnRequestEncoderTest.java b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/encoding/impl/HTTPPostAuthnRequestEncoderTest.java
index 90388da..e626137 100644
--- a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/encoding/impl/HTTPPostAuthnRequestEncoderTest.java
+++ b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/encoding/impl/HTTPPostAuthnRequestEncoderTest.java
@@ -31,7 +31,7 @@ import com.nimbusds.jwt.PlainJWT;
import com.nimbusds.oauth2.sdk.ResponseType;
import com.nimbusds.oauth2.sdk.id.ClientID;
import com.nimbusds.openid.connect.sdk.OIDCClaimsRequest;
-import com.nimbusds.openid.connect.sdk.assurance.claims.VerifiedClaimsSetRequest;
+import com.nimbusds.openid.connect.sdk.assurance.request.VerifiedClaimsSetRequest;
import net.shibboleth.oidc.profile.core.OIDCAuthenticationRequest;
import net.shibboleth.shared.codec.StringDigester;
diff --git a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
index ccf63a9..cf77b04 100644
--- a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
+++ b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
@@ -131,7 +131,7 @@ public class FormOutboundKeySetResponseMessageTest {
final JSONSuccessResponse resp =
(JSONSuccessResponse) profileRequestCtx.ensureOutboundMessageContext().ensureMessage();
Assert.assertTrue(resp.indicatesSuccess());
- final JSONObject keyset = resp.toHTTPResponse().getContentAsJSONObject();
+ final JSONObject keyset = resp.toHTTPResponse().getBodyAsJSONObject();
final JSONArray keys = (JSONArray) keyset.get("keys");
//The test for content could be more thorough
Assert.assertEquals(keys.size(), 3);
diff --git a/pom.xml b/pom.xml
index 7f60d69..3879e17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,12 +48,12 @@
<shib-metadata.version>5.0.0</shib-metadata.version>
<opensaml.groupId>org.opensaml</opensaml.groupId>
<opensaml.version>5.0.0</opensaml.version>
- <nimbus-jose-jwt.version>9.29</nimbus-jose-jwt.version>
- <oauth2-oidc-sdk.version>10.5.1</oauth2-oidc-sdk.version>
- <json.smart.version>2.4.8</json.smart.version>
+ <nimbus-jose-jwt.version>9.39.1</nimbus-jose-jwt.version>
+ <oauth2-oidc-sdk.version>11.11</oauth2-oidc-sdk.version>
+ <json.smart.version>2.5.1</json.smart.version>
<accessors.smart.version>1.2</accessors.smart.version>
<nimbus.lang.tag.version>1.7</nimbus.lang.tag.version>
- <nimbus.content.type.version>2.2</nimbus.content.type.version>
+ <nimbus.content.type.version>2.3</nimbus.content.type.version>
<checkstyle.configLocation>${project.basedir}/resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
<!-- TODO: Remove once in project parent: Base URL for all our deployed javadocs. -->
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list