[java-idp-plugin-duo] branch main updated: Update oidc-common to v2.0.0-SNAPSHOT and fix API changes
Phil Smart
philip.smart at jisc.ac.uk
Thu Mar 24 14:27:04 UTC 2022
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=846fc7c210a13682db90c798e428d47e437e01c2
The following commit(s) were added to refs/heads/main by this push:
new 846fc7c Update oidc-common to v2.0.0-SNAPSHOT and fix API changes
846fc7c is described below
commit 846fc7c210a13682db90c798e428d47e437e01c2
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Mar 24 14:26:59 2022 +0000
Update oidc-common to v2.0.0-SNAPSHOT and fix API changes
- Also depend on the idp.oidc.common.2 module
---
.../idp/plugin/authn/duo/impl/ValidateTokenClaims.java | 6 ++++--
.../idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml | 6 +++---
.../idp/plugin/authn/duo/impl/ValidateTokenClaimsTest.java | 14 +++++++-------
.../idp/plugin/authn/duo/nimbus/plugin.properties | 2 +-
idp-duo-sdk-client-impl/pom.xml | 2 +-
pom.xml | 2 +-
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenClaims.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenClaims.java
index bc98680..0d9614e 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenClaims.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenClaims.java
@@ -36,6 +36,7 @@ import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.plugin.authn.duo.AbstractDuoAuthenticationAction;
import net.shibboleth.idp.plugin.authn.duo.DuoException;
import net.shibboleth.idp.plugin.authn.duo.context.DuoOIDCAuthenticationContext;
+import net.shibboleth.oidc.jwt.claims.ClaimsValidator;
import net.shibboleth.oidc.jwt.claims.JWTClaimsValidation;
import net.shibboleth.oidc.jwt.claims.JWTValidationException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
@@ -87,7 +88,7 @@ public class ValidateTokenClaims extends AbstractDuoAuthenticationAction {
@Nullable private Consumer<ProfileRequestContext> cleanupHook;
/** The JWT claims validator used to verify the claimsset.*/
- @NonnullAfterInit private JWTClaimsValidation claimsValidator;
+ @NonnullAfterInit private ClaimsValidator claimsValidator;
/** {@inheritDoc} */
@Override protected void doInitialize() throws ComponentInitializationException {
@@ -117,7 +118,7 @@ public class ValidateTokenClaims extends AbstractDuoAuthenticationAction {
* @param validator the claims validator.
*/
public void setClaimsValidator(
- @Nonnull final JWTClaimsValidation validator) {
+ @Nonnull final ClaimsValidator validator) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
@@ -182,6 +183,7 @@ public class ValidateTokenClaims extends AbstractDuoAuthenticationAction {
public static class DuoOIDAuthenticationContextCleanupHook implements Consumer<ProfileRequestContext> {
/** {@inheritDoc} */
+ @Override
public void accept(@Nullable final ProfileRequestContext input) {
if (input != null) {
final AuthenticationContext authnCtx = input.getSubcontext(AuthenticationContext.class);
diff --git a/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml b/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
index a61643f..abfe45b 100644
--- a/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
+++ b/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
@@ -144,7 +144,7 @@
<!-- OIDC claims verification -->
<bean id="shibboleth.authn.DuoOIDC.DefaultDuoTokenClaimsVerifier"
- class="net.shibboleth.oidc.security.jwt.claims.impl.ChainingJWTClaimsValidation">
+ class="net.shibboleth.oidc.security.jwt.claims.impl.ChainingJWTClaimsValidator">
<property name="claimValidators">
<list>
<bean id="requiredClaimsValidator"
@@ -168,7 +168,7 @@
p:clockSkew="%{idp.duo.oidc.jwt.verifier.clockSkew:PT60S}"/>
<bean id="issuedAtClaimValidator"
class="net.shibboleth.oidc.security.jwt.claims.impl.IssuedAtClaimsValidator"
- p:iatWindow="%{idp.duo.oidc.jwt.verifier.iatWindow:PT60S}"/>
+ p:messageLifetime="%{idp.duo.oidc.jwt.verifier.iatWindow:PT60S}"/>
<bean id="usernameClaimValidator"
class="net.shibboleth.oidc.security.jwt.claims.impl.ExactMatchClaimsValidator"
p:claimName="%{idp.duo.oidc.jwt.verifier.preferredUsername:preferred_username}"
@@ -199,7 +199,7 @@
class="net.shibboleth.oidc.security.jwt.claims.impl.ForcedAuthenticationActivationCondition"/>
<bean id="shibboleth.authn.DuoOIDC.jwt.DefaultNonceActivationCondition"
- class="net.shibboleth.oidc.security.jwt.claims.impl.NonceValidationActiviationCondition"/>
+ class="net.shibboleth.oidc.security.jwt.claims.impl.NonceValidationActivationCondition"/>
<bean id="shibboleth.authn.DuoOIDC.jwt.DefaultIssuerLookupStrategy"
class="net.shibboleth.idp.plugin.authn.duo.impl.DuoIssuerClaimLookupStrategy"
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenClaimsTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenClaimsTest.java
index 1fc5080..2bb978b 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenClaimsTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateTokenClaimsTest.java
@@ -48,8 +48,8 @@ import com.nimbusds.jwt.proc.BadJWTException;
import net.shibboleth.idp.authn.AuthnEventIds;
import net.shibboleth.idp.plugin.authn.duo.DuoOIDCAuthAPI;
-import net.shibboleth.oidc.jwt.claims.JWTClaimsValidation;
import net.shibboleth.oidc.jwt.claims.JWTValidationException;
+import net.shibboleth.oidc.security.jwt.claims.impl.ChainingJWTClaimsValidator;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
@@ -77,8 +77,8 @@ public class ValidateTokenClaimsTest extends AbstractDuoActionTest {
public final void testValidToken() throws ComponentInitializationException {
//default mock will just return
- final JWTClaimsValidation verifier =
- Mockito.mock(JWTClaimsValidation.class);
+ final ChainingJWTClaimsValidator verifier =
+ Mockito.mock(ChainingJWTClaimsValidator.class);
action.setClaimsValidator(verifier);
addDuoContext();
@@ -105,8 +105,8 @@ public class ValidateTokenClaimsTest extends AbstractDuoActionTest {
//default mock will always throw a validation exception
//default mock will just return
- final JWTClaimsValidation verifier =
- Mockito.mock(JWTClaimsValidation.class);
+ final ChainingJWTClaimsValidator verifier =
+ Mockito.mock(ChainingJWTClaimsValidator.class);
Mockito.doThrow(new JWTValidationException("Invalid JWT")).when(verifier).
validate(Mockito.any(JWTClaimsSet.class), Mockito.any());
@@ -134,8 +134,8 @@ public class ValidateTokenClaimsTest extends AbstractDuoActionTest {
public final void testBlankJWT() throws ComponentInitializationException {
//default mock will just return
- final JWTClaimsValidation verifier =
- Mockito.mock(JWTClaimsValidation.class);
+ final ChainingJWTClaimsValidator verifier =
+ Mockito.mock(ChainingJWTClaimsValidator.class);
action.setClaimsValidator(verifier);
addDuoContext();
diff --git a/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/nimbus/plugin.properties b/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/nimbus/plugin.properties
index 78cd99b..eea7ac9 100644
--- a/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/nimbus/plugin.properties
+++ b/idp-duo-nimbus-client-impl/src/main/resources/net/shibboleth/idp/plugin/authn/duo/nimbus/plugin.properties
@@ -5,4 +5,4 @@ plugin.id = net.shibboleth.idp.plugin.authn.duo.nimbus
plugin.version = 1.1.2
# prereqs
-plugin.modules.required = idp.oidc.common.1
+plugin.modules.required = idp.oidc.common.2
diff --git a/idp-duo-sdk-client-impl/pom.xml b/idp-duo-sdk-client-impl/pom.xml
index d9b47e3..3c03400 100644
--- a/idp-duo-sdk-client-impl/pom.xml
+++ b/idp-duo-sdk-client-impl/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
- <version>3.12.0</version>
+ <version>3.14.9</version>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
diff --git a/pom.xml b/pom.xml
index 4770f09..e024bb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<opensaml.groupId>org.opensaml</opensaml.groupId>
<opensaml.version>4.1.1</opensaml.version>
<java-support.version>8.2.1</java-support.version>
- <oidc.common.version>1.1.0</oidc.common.version>
+ <oidc.common.version>2.0.0-SNAPSHOT</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