[java-idp-plugin-duo] branch main updated: JDUO-68 - Compatibility with oidc-common 2.2.0
Phil Smart
philip.smart at jisc.ac.uk
Thu May 18 10:12:35 UTC 2023
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-idp-plugin-duo.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=454d7ada6ec557707019a35ea50d9328ba86962d
The following commit(s) were added to refs/heads/main by this push:
new 454d7ad JDUO-68 - Compatibility with oidc-common 2.2.0
454d7ad is described below
commit 454d7ada6ec557707019a35ea50d9328ba86962d
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu May 18 11:12:33 2023 +0100
JDUO-68 - Compatibility with oidc-common 2.2.0
- Move JWSAssemblyUtils import from oidc-common-crypto-impl to
oidc-common-crypto-api
https://shibboleth.atlassian.net/browse/JDUO-68
---
idp-duo-impl/pom.xml | 5 +++++
.../idp/plugin/authn/duo/impl/ValidateTokenSignature.java | 3 +--
.../shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_FAIL.java | 4 ++--
.../shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK.java | 4 ++--
.../idp/plugin/authn/mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java | 4 ++--
.../idp/plugin/authn/mock/MockDuoOIDCClient_UNKNOWN.java | 8 ++------
idp-duo-nimbus-client-impl/pom.xml | 5 +++++
.../idp/plugin/authn/duo/nimbus/impl/NimbusClientSupport.java | 2 +-
idp-duo-sdk-client-impl/pom.xml | 5 +++++
.../idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java | 4 ++--
pom.xml | 2 +-
11 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/idp-duo-impl/pom.xml b/idp-duo-impl/pom.xml
index 05a9f7b..222b28c 100644
--- a/idp-duo-impl/pom.xml
+++ b/idp-duo-impl/pom.xml
@@ -37,6 +37,11 @@
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-crypto-impl</artifactId>
<scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-crypto-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenSignature.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenSignature.java
index 9ef614a..cd7065d 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenSignature.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenSignature.java
@@ -36,14 +36,13 @@ import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.jwt.PlainJWT;
import com.nimbusds.jwt.SignedJWT;
-
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
+import net.shibboleth.oidc.security.JWSAssemblyUtils;
import net.shibboleth.oidc.security.credential.BasicJWKCredential;
-import net.shibboleth.oidc.security.impl.JWSAssemblyUtils;
import net.shibboleth.oidc.security.impl.JWTSignatureValidationUtil;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_FAIL.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_FAIL.java
index 3cb21eb..415e87e 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_FAIL.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_FAIL.java
@@ -35,7 +35,7 @@ import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientCapabilities;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
-import net.shibboleth.oidc.security.impl.JWSAssemblyUtils;
+import net.shibboleth.oidc.security.JWSAssemblyUtils;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.codec.EncodingException;
@@ -52,7 +52,7 @@ public class MockDuoOIDCClient_FAIL implements DuoOIDCClient{
@Nonnull private static final String SUB = "jdoe";
- @NonnullAfterInit private DuoOIDCIntegration integration;
+ @NonnullAfterInit private final DuoOIDCIntegration integration;
public MockDuoOIDCClient_FAIL(final @Nonnull DuoOIDCIntegration integ) throws DuoClientException {
integration = integ;
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK.java
index 316225b..fa29700 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK.java
@@ -35,7 +35,7 @@ import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientCapabilities;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
-import net.shibboleth.oidc.security.impl.JWSAssemblyUtils;
+import net.shibboleth.oidc.security.JWSAssemblyUtils;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.codec.EncodingException;
@@ -49,7 +49,7 @@ public class MockDuoOIDCClient_OK implements DuoOIDCClient{
@Nonnull private static final String SUB = "jdoe";
- @NonnullAfterInit private DuoOIDCIntegration integration;
+ @NonnullAfterInit private final DuoOIDCIntegration integration;
public MockDuoOIDCClient_OK(final @Nonnull DuoOIDCIntegration integ) throws DuoClientException {
integration = integ;
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java
index f78dca9..1986c7f 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_OK_OLD_AUTH_TIME.java
@@ -35,7 +35,7 @@ import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientCapabilities;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
-import net.shibboleth.oidc.security.impl.JWSAssemblyUtils;
+import net.shibboleth.oidc.security.JWSAssemblyUtils;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.codec.EncodingException;
@@ -50,7 +50,7 @@ public class MockDuoOIDCClient_OK_OLD_AUTH_TIME implements DuoOIDCClient{
@Nonnull private static final String SUB = "jdoe";
- @NonnullAfterInit private DuoOIDCIntegration integration;
+ @NonnullAfterInit private final DuoOIDCIntegration integration;
public MockDuoOIDCClient_OK_OLD_AUTH_TIME(
final @Nonnull DuoOIDCIntegration integ) throws DuoClientException {
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_UNKNOWN.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_UNKNOWN.java
index caea217..a3d8851 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_UNKNOWN.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/mock/MockDuoOIDCClient_UNKNOWN.java
@@ -27,19 +27,15 @@ import javax.annotation.Nonnull;
import com.nimbusds.jose.JOSEException;
import com.nimbusds.jose.JWSAlgorithm;
-import com.nimbusds.jose.JWSHeader;
-import com.nimbusds.jose.JWSSigner;
-import com.nimbusds.jose.crypto.MACSigner;
import com.nimbusds.jwt.JWT;
import com.nimbusds.jwt.JWTClaimsSet;
-import com.nimbusds.jwt.SignedJWT;
import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientCapabilities;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
-import net.shibboleth.oidc.security.impl.JWSAssemblyUtils;
+import net.shibboleth.oidc.security.JWSAssemblyUtils;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.codec.EncodingException;
@@ -53,7 +49,7 @@ public class MockDuoOIDCClient_UNKNOWN implements DuoOIDCClient{
@Nonnull private static final String SUB = "jdoe";
- @NonnullAfterInit private DuoOIDCIntegration integration;
+ @NonnullAfterInit private final DuoOIDCIntegration integration;
public MockDuoOIDCClient_UNKNOWN(final @Nonnull DuoOIDCIntegration integ) throws DuoClientException {
integration = integ;
diff --git a/idp-duo-nimbus-client-impl/pom.xml b/idp-duo-nimbus-client-impl/pom.xml
index 4d80249..5f0edd9 100644
--- a/idp-duo-nimbus-client-impl/pom.xml
+++ b/idp-duo-nimbus-client-impl/pom.xml
@@ -50,6 +50,11 @@
<artifactId>oidc-common-crypto-impl</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-crypto-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Needed for module/plugin impls. -->
<dependency>
diff --git a/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientSupport.java b/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientSupport.java
index 6fc3522..6ed3a8b 100644
--- a/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientSupport.java
+++ b/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientSupport.java
@@ -30,7 +30,7 @@ import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.jwt.JWTClaimsSet;
import net.shibboleth.idp.plugin.authn.duo.DuoClientException;
-import net.shibboleth.oidc.security.impl.JWSAssemblyUtils;
+import net.shibboleth.oidc.security.JWSAssemblyUtils;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.codec.EncodingException;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-duo-sdk-client-impl/pom.xml b/idp-duo-sdk-client-impl/pom.xml
index 9e2be76..582248e 100644
--- a/idp-duo-sdk-client-impl/pom.xml
+++ b/idp-duo-sdk-client-impl/pom.xml
@@ -101,6 +101,11 @@
<artifactId>oidc-common-crypto-impl</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-crypto-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>net.shibboleth.utilities</groupId>
<artifactId>java-support</artifactId>
diff --git a/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java b/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java
index a6f016d..baf1664 100644
--- a/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java
+++ b/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientAdaptor.java
@@ -48,7 +48,7 @@ import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheck;
import net.shibboleth.idp.plugin.authn.duo.model.DuoHealthCheckResponse;
-import net.shibboleth.oidc.security.impl.JWSAssemblyUtils;
+import net.shibboleth.oidc.security.JWSAssemblyUtils;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.codec.EncodingException;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -208,7 +208,7 @@ public final class DuoSDKClientAdaptor extends AbstractDuoOIDCClient{
private final class DefaultTokenResponseConverter implements BiFunction<Token, DuoOIDCIntegration, JWT>{
/** Thread-safe JSON object mapper. */
- @Nonnull private ObjectMapper objectMapper;
+ @Nonnull private final ObjectMapper objectMapper;
/** Constructor. */
private DefaultTokenResponseConverter() {
diff --git a/pom.xml b/pom.xml
index 50ff56c..f601803 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<opensaml.version>4.3.0</opensaml.version>
<java-support.version>8.4.0</java-support.version>
<spring-extensions.version>6.3.0</spring-extensions.version>
- <oidc.common.version>2.0.0</oidc.common.version>
+ <oidc.common.version>2.2.0</oidc.common.version>
<checkstyle.configLocation>${project.basedir}/checkstyle.xml</checkstyle.configLocation>
<jdk.version>15.3</jdk.version>
</properties>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list