[java-idp-plugin-oidc-rp] branch main updated: Cleanup actions that do not need to be a type of authentication action
Phil Smart
philip.smart at jisc.ac.uk
Thu Nov 30 17:51:54 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-oidc-rp.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-oidc-rp.git;a=commit;h=21b3ea6aacaffb7ce8451bf874300b78008019d2
The following commit(s) were added to refs/heads/main by this push:
new 21b3ea6 Cleanup actions that do not need to be a type of authentication action
21b3ea6 is described below
commit 21b3ea6aacaffb7ce8451bf874300b78008019d2
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Nov 30 17:51:46 2023 +0000
Cleanup actions that do not need to be a type of authentication action
---
.../rp/impl/AbstractOIDCAuthenticationResponseAction.java | 5 ++++-
.../idp/plugin/authn/oidc/rp/impl/BuildRequestObject.java | 15 ++++++++-------
.../plugin/authn/oidc/rp/impl/ProcessEndUserClaims.java | 15 ++++++++-------
.../oidc/rp/impl/ValidateOAuthAccessTokenResponse.java | 8 +++-----
.../plugin/authn/oidc/rp/impl/ValidateTokenClaims.java | 15 ++++++++-------
.../oidc/rp/impl/ValidateUserInfoJSONObjectClaims.java | 15 ++++++++-------
.../OIDCRelyingParty/oidc-relying-party-authn-beans.xml | 10 ++--------
.../plugin/authn/oidc/rp/impl/BuildRequestObjectTest.java | 3 ---
.../authn/oidc/rp/impl/ProcessEndUserClaimsTest.java | 3 ---
.../rp/impl/ValidateOAuthAccessTokenResponseTest.java | 3 ---
10 files changed, 41 insertions(+), 51 deletions(-)
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AbstractOIDCAuthenticationResponseAction.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AbstractOIDCAuthenticationResponseAction.java
index 88ce008..f0090bd 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AbstractOIDCAuthenticationResponseAction.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AbstractOIDCAuthenticationResponseAction.java
@@ -119,7 +119,10 @@ public abstract class AbstractOIDCAuthenticationResponseAction extends AbstractA
protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext,
@Nonnull final AuthenticationContext authenticationContext) {
-
+ if (!super.doPreExecute(profileRequestContext, authenticationContext)) {
+ return false;
+ }
+
final MessageContext inboundMessageCtx = profileRequestContext.getInboundMessageContext();
if (inboundMessageCtx == null) {
log.error("{} No inbound message context", getLogPrefix());
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/BuildRequestObject.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/BuildRequestObject.java
index 35882dc..e3113e9 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/BuildRequestObject.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/BuildRequestObject.java
@@ -37,9 +37,8 @@ import com.nimbusds.openid.connect.sdk.claims.ACR;
import com.nimbusds.openid.connect.sdk.claims.ClaimsSet;
import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
-import net.shibboleth.idp.authn.AbstractAuthenticationAction;
import net.shibboleth.idp.authn.AuthnEventIds;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
+import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.oidc.metadata.context.OIDCProviderMetadataContext;
import net.shibboleth.oidc.profile.core.OIDCAuthenticationRequest;
import net.shibboleth.oidc.profile.encoding.AuthenticationContextClassReferenceSupport;
@@ -67,7 +66,7 @@ import net.shibboleth.shared.primitive.LoggerFactory;
* instance of OIDCAuthenticationRequest.class</pre>
* @post Add a JWT request object to the in-flight authentication request
*/
-public class BuildRequestObject extends AbstractAuthenticationAction {
+public class BuildRequestObject extends AbstractProfileAction {
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(BuildRequestObject.class);
@@ -164,8 +163,11 @@ public class BuildRequestObject extends AbstractAuthenticationAction {
}
@Override
- protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext,
- @Nonnull final AuthenticationContext authenticationContext) {
+ protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
+
+ if (!super.doPreExecute(profileRequestContext)) {
+ return false;
+ }
final MessageContext outboundMsgContext = profileRequestContext.getOutboundMessageContext();
if (outboundMsgContext == null) {
@@ -207,8 +209,7 @@ public class BuildRequestObject extends AbstractAuthenticationAction {
// in some way
/** {@inheritDoc} */
@Override
- protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext,
- @Nonnull final AuthenticationContext authenticationContext) {
+ protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
log.debug("{} Building a plain RequestObject JWT", getLogPrefix());
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ProcessEndUserClaims.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ProcessEndUserClaims.java
index 4cef84f..f8cb4d8 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ProcessEndUserClaims.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ProcessEndUserClaims.java
@@ -34,11 +34,10 @@ import com.nimbusds.openid.connect.sdk.OIDCTokenResponse;
import com.nimbusds.openid.connect.sdk.UserInfoSuccessResponse;
import com.nimbusds.openid.connect.sdk.claims.ClaimsSet;
-import net.shibboleth.idp.authn.AbstractAuthenticationAction;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.plugin.authn.oidc.rp.context.AccessTokenResponseContext;
import net.shibboleth.idp.plugin.authn.oidc.rp.context.EndUserClaimsContext;
import net.shibboleth.idp.plugin.authn.oidc.rp.context.UserInfoResponseContext;
+import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.shared.annotation.constraint.NonnullBeforeExec;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.LoggerFactory;
@@ -56,7 +55,7 @@ import net.shibboleth.shared.primitive.LoggerFactory;
* @event {@link EventIds#INVALID_PROFILE_CTX}
* @post Add a set of merged and sanatized claims to the {@link EndUserClaimsContext}.
*/
-public class ProcessEndUserClaims extends AbstractAuthenticationAction {
+public class ProcessEndUserClaims extends AbstractProfileAction {
/** Class logger.*/
@Nonnull private final Logger log = LoggerFactory.getLogger(ProcessEndUserClaims.class);
@@ -197,8 +196,11 @@ public class ProcessEndUserClaims extends AbstractAuthenticationAction {
}
// Checkstyle: CyclomaticComplexity OFF
- @Override protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext,
- @Nonnull final AuthenticationContext authenticationContext) {
+ @Override protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
+
+ if (!super.doPreExecute(profileRequestContext)) {
+ return false;
+ }
final UserInfoResponseContext userInfoCtx =
userInfoResponseContextLookupStrategy.apply(profileRequestContext);
@@ -259,8 +261,7 @@ public class ProcessEndUserClaims extends AbstractAuthenticationAction {
// Checkstyle: CyclomaticComplexity ON
- @Override protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext,
- @Nonnull final AuthenticationContext authenticationContext) {
+ @Override protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
if (log.isTraceEnabled()) {
log.trace("{} Processing {} claims", getLogPrefix(),
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateOAuthAccessTokenResponse.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateOAuthAccessTokenResponse.java
index 25bb332..a478142 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateOAuthAccessTokenResponse.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateOAuthAccessTokenResponse.java
@@ -29,9 +29,8 @@ import org.slf4j.Logger;
import com.nimbusds.openid.connect.sdk.OIDCTokenResponse;
-import net.shibboleth.idp.authn.AbstractAuthenticationAction;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.plugin.authn.oidc.rp.context.AccessTokenResponseContext;
+import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.oidc.profile.core.OidcEventIds;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.logic.Constraint;
@@ -47,7 +46,7 @@ import net.shibboleth.shared.primitive.LoggerFactory;
* @event {@link EventIds#INVALID_PROFILE_CTX}
* @event {@link OidcEventIds#INVALID_ACCESS_TOKEN}
*/
-public class ValidateOAuthAccessTokenResponse extends AbstractAuthenticationAction {
+public class ValidateOAuthAccessTokenResponse extends AbstractProfileAction {
/** Class logger. */
@Nonnull @NotEmpty private final Logger log = LoggerFactory.getLogger(ValidateOAuthAccessTokenResponse.class);
@@ -78,8 +77,7 @@ public class ValidateOAuthAccessTokenResponse extends AbstractAuthenticationActi
// Checkstyle: CyclomaticComplexity OFF
/** {@inheritDoc} */
- @Override protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext,
- @Nonnull final AuthenticationContext authenticationContext) {
+ @Override protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
final AccessTokenResponseContext responseCtx = tokenResponseContextLookupStrategy.apply(profileRequestContext);
if (responseCtx == null) {
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateTokenClaims.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateTokenClaims.java
index 15055dd..0a52399 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateTokenClaims.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateTokenClaims.java
@@ -29,10 +29,9 @@ import org.slf4j.Logger;
import com.nimbusds.jwt.JWT;
import com.nimbusds.jwt.JWTClaimsSet;
-import net.shibboleth.idp.authn.AbstractAuthenticationAction;
import net.shibboleth.idp.authn.AuthnEventIds;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.plugin.authn.oidc.rp.exception.OIDCRPException;
+import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.oidc.jwt.claims.ClaimsValidator;
import net.shibboleth.oidc.jwt.claims.JWTValidationException;
import net.shibboleth.oidc.profile.core.OidcEventIds;
@@ -55,7 +54,7 @@ import net.shibboleth.shared.primitive.LoggerFactory;
* @event {@link AuthnEventIds#INVALID_AUTHN_CTX}
* @event {@link OidcEventIds#INVALID_TOKEN}
*/
-public class ValidateTokenClaims extends AbstractAuthenticationAction {
+public class ValidateTokenClaims extends AbstractProfileAction {
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(ValidateTokenClaims.class);
@@ -120,8 +119,11 @@ public class ValidateTokenClaims extends AbstractAuthenticationAction {
}
@Override
- protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext,
- @Nonnull final AuthenticationContext authenticationContext) {
+ protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
+
+ if (!super.doPreExecute(profileRequestContext)) {
+ return false;
+ }
final JWT token = jwtLookupStrategy.apply(profileRequestContext);
if (token == null) {
@@ -144,8 +146,7 @@ public class ValidateTokenClaims extends AbstractAuthenticationAction {
}
@Override
- protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext,
- @Nonnull final AuthenticationContext authenticationContext) {
+ protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
final String subject = claimsSet.getSubject() != null ? claimsSet.getSubject() : "unknown subject";
log.debug("{} Validating JWT claims for subject '{}'",getLogPrefix(), subject);
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateUserInfoJSONObjectClaims.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateUserInfoJSONObjectClaims.java
index 962e2e7..8878ed6 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateUserInfoJSONObjectClaims.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateUserInfoJSONObjectClaims.java
@@ -34,10 +34,9 @@ import com.nimbusds.openid.connect.sdk.UserInfoResponse;
import com.nimbusds.openid.connect.sdk.UserInfoSuccessResponse;
import com.nimbusds.openid.connect.sdk.claims.ClaimsSet;
-import net.shibboleth.idp.authn.AbstractAuthenticationAction;
-import net.shibboleth.idp.authn.context.AuthenticationContext;
import net.shibboleth.idp.plugin.authn.oidc.rp.context.AccessTokenResponseContext;
import net.shibboleth.idp.plugin.authn.oidc.rp.context.UserInfoResponseContext;
+import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.oidc.profile.core.OidcEventIds;
import net.shibboleth.shared.annotation.constraint.NonnullBeforeExec;
import net.shibboleth.shared.logic.Constraint;
@@ -51,7 +50,7 @@ import net.shibboleth.shared.primitive.LoggerFactory;
* @event {@link OidcEventIds#INVALID_USERINFO_CLAIMS}
* @event {@link EventIds#INVALID_PROFILE_CTX}
*/
-public class ValidateUserInfoJSONObjectClaims extends AbstractAuthenticationAction {
+public class ValidateUserInfoJSONObjectClaims extends AbstractProfileAction {
/** Class logger.*/
@Nonnull private final Logger log = LoggerFactory.getLogger(ValidateUserInfoJSONObjectClaims.class);
@@ -107,8 +106,11 @@ public class ValidateUserInfoJSONObjectClaims extends AbstractAuthenticationActi
"UserInfoResponseContext lookup strategy cannot be null");
}
- @Override protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext,
- @Nonnull final AuthenticationContext authenticationContext) {
+ @Override protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
+
+ if (!super.doPreExecute(profileRequestContext)) {
+ return false;
+ }
userInfoCtx =
userInfoResponseContextLookupStrategy.apply(profileRequestContext);
@@ -150,8 +152,7 @@ public class ValidateUserInfoJSONObjectClaims extends AbstractAuthenticationActi
return true;
}
- @Override protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext,
- @Nonnull final AuthenticationContext authenticationContext) {
+ @Override protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
log.trace("{} Validating UserInfo JSON Object claims", getLogPrefix());
diff --git a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-beans.xml b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-beans.xml
index de997b7..41491b5 100644
--- a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-beans.xml
+++ b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-beans.xml
@@ -229,7 +229,6 @@
<bean id="BuildRequestObject" class="net.shibboleth.idp.plugin.authn.oidc.rp.impl.BuildRequestObject"
scope="prototype" p:profileContextLookupStrategy-ref="shibboleth.ChildLookup.ProxyProfileRequestContext"
- p:authenticationContextLookupStrategy-ref="ParentAuthenticiationContextLookup"
p:claimsSetIsValidPredicate="#{getObject('shibboleth.authn.oidc.rp.RequestObjectClaimsSetIsValidPredicate')}"
p:requestObjectToBeSignedPredicate-ref="SignRequestObjectCondition" />
@@ -425,8 +424,7 @@
<bean id="ValidateOAuthAccessTokenResponse" scope="prototype"
class="net.shibboleth.idp.plugin.authn.oidc.rp.impl.ValidateOAuthAccessTokenResponse"
- p:profileContextLookupStrategy-ref="shibboleth.ChildLookup.ProxyProfileRequestContext"
- p:authenticationContextLookupStrategy-ref="ParentAuthenticiationContextLookup" />
+ p:profileContextLookupStrategy-ref="shibboleth.ChildLookup.ProxyProfileRequestContext"/>
<bean id="DefaultTokenResponseDecoder" scope="prototype"
class="net.shibboleth.idp.plugin.authn.oidc.rp.decoding.impl.DefaultAccessTokenResponseDecoder"
@@ -515,7 +513,6 @@
<bean id="ValidateIDTokenClaims" scope="prototype"
class="net.shibboleth.idp.plugin.authn.oidc.rp.impl.ValidateTokenClaims"
p:profileContextLookupStrategy-ref="shibboleth.ChildLookup.ProxyProfileRequestContext"
- p:authenticationContextLookupStrategy-ref="ParentAuthenticiationContextLookup"
p:cleanupHook="#{getObject('shibboleth.authn.oidc.rp.idtoken.jwt.claims.CleanUpHook')}"
p:claimsValidator="#{getObject('shibboleth.authn.oidc.rp.idtoken.IDTokenClaimsValidator')
?: getObject('DefaultIDTokenClaimsValidator')}"
@@ -780,7 +777,6 @@
<bean id="ValidateUserInfoTokenClaims" scope="prototype"
class="net.shibboleth.idp.plugin.authn.oidc.rp.impl.ValidateTokenClaims"
p:profileContextLookupStrategy-ref="shibboleth.ChildLookup.ProxyProfileRequestContext"
- p:authenticationContextLookupStrategy-ref="ParentAuthenticiationContextLookup"
p:cleanupHook="#{getObject('shibboleth.authn.oidc.rp.userinfo.jwt.claims.CleanUpHook')}"
p:claimsValidator="#{getObject('shibboleth.authn.oidc.rp.userinfo.UserInfoTokenClaimsValidator')
?: getObject('DefaultUserInfoTokenClaimsValidator')}"
@@ -821,8 +817,7 @@
<!-- This is a very simplified and hard coded version of the claims verification used for a JWT. Maybe look to replace -->
<bean id="ValidateUserInfoPlainResponseClaims" scope="prototype"
class="net.shibboleth.idp.plugin.authn.oidc.rp.impl.ValidateUserInfoJSONObjectClaims"
- p:profileContextLookupStrategy-ref="shibboleth.ChildLookup.ProxyProfileRequestContext"
- p:authenticationContextLookupStrategy-ref="ParentAuthenticiationContextLookup" />
+ p:profileContextLookupStrategy-ref="shibboleth.ChildLookup.ProxyProfileRequestContext"/>
<bean id="PostPlainUserInfoResponsePopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
p:profileContextLookupStrategy-ref="shibboleth.ChildLookup.ProxyProfileRequestContext"
@@ -830,7 +825,6 @@
<bean id="ProcessEndUserClaims" class="net.shibboleth.idp.plugin.authn.oidc.rp.impl.ProcessEndUserClaims"
scope="prototype" p:profileContextLookupStrategy-ref="shibboleth.ChildLookup.ProxyProfileRequestContext"
- p:authenticationContextLookupStrategy-ref="ParentAuthenticiationContextLookup"
p:claimMergingStrategy="#{getObject('shibboleth.authn.oidc.rp.ClaimMergingStrategy') ?: getObject('DefaultClaimMergingStrategy')}"
p:claimSanitizationStrategy="#{getObject('shibboleth.authn.oidc.rp.ClaimSanitizationStrategy') ?: getObject('DefaultClaimSanitizationStrategy')}" />
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/BuildRequestObjectTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/BuildRequestObjectTest.java
index 91fa866..397637c 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/BuildRequestObjectTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/BuildRequestObjectTest.java
@@ -24,7 +24,6 @@ import java.time.Duration;
import java.util.List;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
-import org.opensaml.messaging.context.navigate.ParentContextLookup;
import org.opensaml.profile.context.ProfileRequestContext;
import org.springframework.webflow.execution.Event;
import org.testng.annotations.BeforeMethod;
@@ -79,8 +78,6 @@ public class BuildRequestObjectTest extends AbstractOIDCTest {
new ChildContextLookup<>(AuthenticationContext.class)
.compose(new WebflowRequestContextProfileRequestContextLookup())));
- action.setAuthenticationContextLookupStrategy(new ParentContextLookup<>(AuthenticationContext.class));
-
// Setup a basic authentication request
authnRequest.setNonce(new Nonce());
authnRequest.setResponseType(Constraint.isNotNull(ResponseType.CODE, "response code is null"));
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ProcessEndUserClaimsTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ProcessEndUserClaimsTest.java
index 9657b15..2bbc413 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ProcessEndUserClaimsTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ProcessEndUserClaimsTest.java
@@ -28,7 +28,6 @@ import java.util.stream.Collectors;
import org.mockito.Mockito;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
-import org.opensaml.messaging.context.navigate.ParentContextLookup;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
import org.springframework.webflow.execution.Event;
@@ -87,8 +86,6 @@ public class ProcessEndUserClaimsTest extends AbstractOIDCTest {
new ChildContextLookup<>(AuthenticationContext.class)
.compose(new WebflowRequestContextProfileRequestContextLookup())));
- action.setAuthenticationContextLookupStrategy(new ParentContextLookup<>(AuthenticationContext.class));
-
// Merge by putting all from each
action.setClaimMergingStrategy((idToken, userInfo) -> {
final ClaimsSet out = new ClaimsSet();
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateOAuthAccessTokenResponseTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateOAuthAccessTokenResponseTest.java
index feaca31..2a3d638 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateOAuthAccessTokenResponseTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/ValidateOAuthAccessTokenResponseTest.java
@@ -26,7 +26,6 @@ import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.io.entity.StringEntity;
import org.mockito.Mockito;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
-import org.opensaml.messaging.context.navigate.ParentContextLookup;
import org.opensaml.profile.context.ProfileRequestContext;
import org.springframework.http.MediaType;
import org.springframework.webflow.execution.Event;
@@ -74,8 +73,6 @@ public class ValidateOAuthAccessTokenResponseTest extends AbstractOIDCTest {
new ChildContextLookup<>(AuthenticationContext.class)
.compose(new WebflowRequestContextProfileRequestContextLookup())));
- action.setAuthenticationContextLookupStrategy(new ParentContextLookup<>(AuthenticationContext.class));
-
httpResponse = Mockito.mock(ClassicHttpResponse.class);
Mockito.when(httpResponse.getCode()).thenReturn(200);
Mockito.when(httpResponse.getEntity()).thenReturn(new StringEntity(ACCESS_TOKEN_RESPONSE,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list