[java-idp-oidc] branch main updated: Null cleanup.
Henri Mikkonen
henri.mikkonen at iki.fi
Tue Apr 2 10:39:50 UTC 2024
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=ecf4ba6fea6dfb8aa5b08dfb35902c43db0363b0
The following commit(s) were added to refs/heads/main by this push:
new ecf4ba6f Null cleanup.
ecf4ba6f is described below
commit ecf4ba6fea6dfb8aa5b08dfb35902c43db0363b0
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Tue Apr 2 13:39:46 2024 +0300
Null cleanup.
---
.../context/logic/ValidatedScopePredicate.java | 4 +-
.../AbstractTokenClaimsLookupFunctionTest.java | 12 +++-
.../oauth2/profile/impl/BuildAccessTokenTest.java | 23 ++++---
.../impl/AddGrantTypeToClientMetadataTest.java | 6 +-
.../impl/AddResponseTypesToClientMetadataTest.java | 4 +-
...dSecurityConfigurationToClientMetadataTest.java | 73 ++++++++++++----------
.../oidc/op/profile/impl/RevokeConsentTest.java | 11 ----
7 files changed, 72 insertions(+), 61 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/logic/ValidatedScopePredicate.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/logic/ValidatedScopePredicate.java
index 17ba6a7b..cc4fb780 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/logic/ValidatedScopePredicate.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/logic/ValidatedScopePredicate.java
@@ -15,7 +15,6 @@
package net.shibboleth.idp.plugin.oidc.op.messaging.context.logic;
import java.util.Collection;
-import java.util.Collections;
import java.util.function.Predicate;
import javax.annotation.Nonnull;
@@ -28,6 +27,7 @@ import net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.ValidatedScope
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.logic.StrategyIndirectedPredicate;
/**
@@ -55,7 +55,7 @@ public class ValidatedScopePredicate extends StrategyIndirectedPredicate<Profil
* @param value a single value to check against
*/
public ValidatedScopePredicate(@Nonnull @NotEmpty @ParameterName(name="value") final String value) {
- this(Collections.singleton(value));
+ this(CollectionSupport.singleton(value));
}
/**
diff --git a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractTokenClaimsLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractTokenClaimsLookupFunctionTest.java
index 0e908ca4..caf95eae 100644
--- a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractTokenClaimsLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractTokenClaimsLookupFunctionTest.java
@@ -24,12 +24,16 @@ import net.shibboleth.shared.security.impl.SecureRandomIdentifierGenerationStrat
import java.net.URI;
import java.time.Instant;
+import javax.annotation.Nonnull;
+
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.profile.context.ProfileRequestContext;
import org.springframework.webflow.execution.RequestContext;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+
+import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.oauth2.sdk.Scope;
import com.nimbusds.oauth2.sdk.id.ClientID;
@@ -81,15 +85,17 @@ public class AbstractTokenClaimsLookupFunctionTest {
prc.setOutboundMessageContext(new MessageContext());
Assert.assertNull(mock.apply(prc));
// No token claims set
- prc.getOutboundMessageContext().addSubcontext(new OIDCAuthenticationResponseContext());
+ prc.ensureOutboundMessageContext().addSubcontext(new OIDCAuthenticationResponseContext());
Assert.assertNull(mock.apply(prc));
}
class MockSubLookupFunction extends AbstractTokenClaimsLookupFunction<Object> {
@Override
- Object doLookup(TokenClaimsSet tokenClaims) {
- return tokenClaims.getClaimsSet().getClaim("sub");
+ Object doLookup(@Nonnull TokenClaimsSet tokenClaims) {
+ final JWTClaimsSet claimsSet = tokenClaims.getClaimsSet();
+ assert claimsSet != null;
+ return claimsSet.getClaim("sub");
}
}
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/BuildAccessTokenTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/BuildAccessTokenTest.java
index fc4219f8..3a576248 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/BuildAccessTokenTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/BuildAccessTokenTest.java
@@ -50,6 +50,7 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import com.nimbusds.jwt.JWT;
import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.oauth2.sdk.Scope;
import com.nimbusds.oauth2.sdk.id.ClientID;
@@ -61,7 +62,7 @@ import com.nimbusds.oauth2.sdk.id.ClientID;
public class BuildAccessTokenTest extends BaseOIDCResponseActionTest {
/** Action to test. */
- @Nullable private BuildAccessToken action;
+ private BuildAccessToken action;
@BeforeMethod
protected void setUp() throws Exception {
@@ -284,14 +285,20 @@ public class BuildAccessTokenTest extends BaseOIDCResponseActionTest {
throws NoSuchAlgorithmException, ParseException, DataSealerException, ComponentInitializationException {
assertEquals(ctx.getLifetime(), Duration.ofMinutes(10));
-
- if (ctx.getOpaque() != null) {
- final AccessTokenClaimsSet at = AccessTokenClaimsSet.parse(ctx.getOpaque(), getDataSealer());
+
+ final String opaque = ctx.getOpaque();
+ final JWT jwt = ctx.getJWT();
+ if (opaque != null) {
+ final AccessTokenClaimsSet at = AccessTokenClaimsSet.parse(opaque, getDataSealer());
assertNotNull(at);
assertEquals(at.getACR(), "0");
assertEquals(at.getAudience(), audiences);
- assertTrue(at.getAuthenticationTime().isBefore(Instant.now()));
- assertEquals(at.getClientID().getValue(), clientId);
+ final Instant authenticationTime = at.getAuthenticationTime();
+ assert authenticationTime != null;
+ assertTrue(authenticationTime.isBefore(Instant.now()));
+ final ClientID clientID = at.getClientID();
+ assert clientID != null;
+ assertEquals(clientID.getValue(), clientId);
assertEquals(at.getExp(), at.getIssuedAt().plusSeconds(600));
assertEquals(at.getIssuer(), ActionTestingSupport.OUTBOUND_MSG_ISSUER);
assertTrue(at.getIssuedAt().isBefore(Instant.now()));
@@ -304,8 +311,8 @@ public class BuildAccessTokenTest extends BaseOIDCResponseActionTest {
} else {
Assert.assertEquals(at.getSessionIdentifier(), sid);
}
- } else if (ctx.getJWT() != null) {
- final JWTClaimsSet claims = ctx.getJWT().getJWTClaimsSet();
+ } else if (jwt != null) {
+ final JWTClaimsSet claims = jwt.getJWTClaimsSet();
assertNotNull(claims);
assertEquals(claims.getStringClaim(TokenClaimsSet.KEY_ACR), "0");
assertEquals(claims.getAudience(), audiences);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddGrantTypeToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddGrantTypeToClientMetadataTest.java
index 37d98726..432078bb 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddGrantTypeToClientMetadataTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddGrantTypeToClientMetadataTest.java
@@ -17,6 +17,7 @@ package net.shibboleth.idp.plugin.oidc.op.profile.impl;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.function.Predicate;
import javax.annotation.Nonnull;
@@ -27,14 +28,13 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
import com.nimbusds.oauth2.sdk.GrantType;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.PredicateSupport;
/**
* Unit tests for {@link AddGrantTypeToClientMetadata}.
@@ -44,7 +44,7 @@ public class AddGrantTypeToClientMetadataTest extends BaseOIDCClientMetadataPopu
@Override
protected AbstractOIDCClientMetadataPopulationAction constructAction() {
final AddGrantTypeToClientMetadata newAction = new AddGrantTypeToClientMetadata();
- final Predicate<ProfileRequestContext> predicate = Predicates.alwaysTrue();
+ final Predicate<ProfileRequestContext> predicate = PredicateSupport.alwaysTrue();
newAction.setAuthorizationCodeFlowEnabled(predicate);
newAction.setImplicitFlowEnabled(predicate);
newAction.setRefreshTokensEnabled(predicate);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddResponseTypesToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddResponseTypesToClientMetadataTest.java
index 001cfbf5..a33cbf6b 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddResponseTypesToClientMetadataTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddResponseTypesToClientMetadataTest.java
@@ -32,7 +32,6 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.base.Predicates;
import com.nimbusds.oauth2.sdk.ResponseType;
import com.nimbusds.openid.connect.sdk.OIDCResponseTypeValue;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
@@ -40,6 +39,7 @@ import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.PredicateSupport;
/**
* Unit tests for {@link AddResponseTypesToClientMetadata}.
@@ -49,7 +49,7 @@ public class AddResponseTypesToClientMetadataTest extends BaseOIDCClientMetadata
@Override
protected AbstractOIDCClientMetadataPopulationAction constructAction() {
final AddResponseTypesToClientMetadata newAction = new AddResponseTypesToClientMetadata();
- final Predicate<ProfileRequestContext> predicate = Predicates.alwaysTrue();
+ final Predicate<ProfileRequestContext> predicate = PredicateSupport.alwaysTrue();
newAction.setAuthorizationCodeFlowEnabled(predicate);
newAction.setImplicitFlowEnabled(predicate);
final Map<ResponseType, Predicate<ProfileRequestContext>>supportedResponseTypes = new HashMap<>();
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddSecurityConfigurationToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddSecurityConfigurationToClientMetadataTest.java
index 45abca53..fad66e4d 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddSecurityConfigurationToClientMetadataTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddSecurityConfigurationToClientMetadataTest.java
@@ -14,7 +14,6 @@
package net.shibboleth.idp.plugin.oidc.op.profile.impl;
-import java.util.Collections;
import java.util.List;
import javax.annotation.Nonnull;
@@ -40,6 +39,7 @@ import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
import net.shibboleth.profile.config.ProfileConfiguration;
import net.shibboleth.profile.context.RelyingPartyContext;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
/**
@@ -60,8 +60,10 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
return new AddSecurityConfigurationToClientMetadata();
}
- protected static void initializeRpCtx(final ProfileRequestContext profileRequestCtx, final List<String> signingAlgs,
- final List<String> encyrptionAlgs, final List<String> encryptionEncs) {
+ protected static void initializeRpCtx(final ProfileRequestContext profileRequestCtx,
+ @Nonnull final List<String> signingAlgs,
+ @Nonnull final List<String> encyrptionAlgs,
+ @Nonnull final List<String> encryptionEncs) {
final RelyingPartyContext rpCtx = profileRequestCtx.getSubcontext(RelyingPartyContext.class);
final ProfileConfiguration profileConfig = Mockito.mock(ProfileConfiguration.class);
final JSONSecurityConfiguration secConfig = Mockito.mock(JSONSecurityConfiguration.class);
@@ -78,8 +80,8 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
}
protected void setUpContext(@Nonnull final OIDCClientMetadata input, @Nonnull final OIDCClientMetadata output,
- final List<String> signingAlgs, final List<String> encryptionAlgs, final List<String> encryptionEncs)
- throws ComponentInitializationException {
+ @Nonnull final List<String> signingAlgs, @Nonnull final List<String> encryptionAlgs,
+ @Nonnull final List<String> encryptionEncs) throws ComponentInitializationException {
super.setUpContext(input, output);
initializeRpCtx(profileRequestCtx, signingAlgs, encryptionAlgs, encryptionEncs);
}
@@ -96,7 +98,8 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
public void testSignatureAlgorithmsListWithEmptyRequest() throws ComponentInitializationException {
OIDCClientMetadata input = new OIDCClientMetadata();
OIDCClientMetadata output = new OIDCClientMetadata();
- setUpContext(input, output, Collections.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256), null, null);
+ setUpContext(input, output, CollectionSupport.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
+ CollectionSupport.emptyList(), CollectionSupport.emptyList());
Assert.assertNull(action.execute(requestCtx));
Assert.assertEquals(output.getIDTokenJWSAlg(), JWSAlgorithm.RS256);
Assert.assertNull(output.getIDTokenJWEEnc());
@@ -108,7 +111,8 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
OIDCClientMetadata input = new OIDCClientMetadata();
input.setIDTokenJWSAlg(JWSAlgorithm.RS256);
OIDCClientMetadata output = new OIDCClientMetadata();
- setUpContext(input, output, Collections.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256), null, null);
+ setUpContext(input, output, CollectionSupport.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
+ CollectionSupport.emptyList(), CollectionSupport.emptyList());
Assert.assertNull(action.execute(requestCtx));
Assert.assertEquals(output.getIDTokenJWSAlg(), JWSAlgorithm.RS256);
Assert.assertNull(output.getIDTokenJWEEnc());
@@ -121,8 +125,9 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
input.setIDTokenJWSAlg(JWSAlgorithm.ES512);
OIDCClientMetadata output = new OIDCClientMetadata();
setUpContext(input, output,
- List.of(SignatureConstants.ALGO_ID_SIGNATURE_RS_256, SignatureConstants.ALGO_ID_SIGNATURE_ES_512),
- null, null);
+ CollectionSupport.listOf(SignatureConstants.ALGO_ID_SIGNATURE_RS_256,
+ SignatureConstants.ALGO_ID_SIGNATURE_ES_512),
+ CollectionSupport.emptyList(), CollectionSupport.emptyList());
Assert.assertNull(action.execute(requestCtx));
Assert.assertEquals(output.getIDTokenJWSAlg(), JWSAlgorithm.ES512);
Assert.assertNull(output.getIDTokenJWEEnc());
@@ -135,7 +140,8 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
input.setIDTokenJWEAlg(null);
input.setIDTokenJWEEnc(EncryptionMethod.A128CBC_HS256);
OIDCClientMetadata output = new OIDCClientMetadata();
- setUpContext(input, output, Collections.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256), null, null);
+ setUpContext(input, output, CollectionSupport.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
+ CollectionSupport.emptyList(), CollectionSupport.emptyList());
ActionTestingSupport.assertEvent(action.execute(requestCtx), EventIds.INVALID_MESSAGE);
}
@@ -145,9 +151,9 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
input.setIDTokenJWEAlg(new JWEAlgorithm(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5));
input.setIDTokenJWEEnc(EncryptionMethod.A256CBC_HS512);
OIDCClientMetadata output = new OIDCClientMetadata();
- setUpContext(input, output, Collections.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
- Collections.singletonList(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5),
- Collections.singletonList(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256));
+ setUpContext(input, output, CollectionSupport.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
+ CollectionSupport.singletonList(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5),
+ CollectionSupport.singletonList(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256));
ActionTestingSupport.assertEvent(action.execute(requestCtx), EventIds.INVALID_MESSAGE);
}
@@ -157,9 +163,9 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
input.setIDTokenJWEAlg(new JWEAlgorithm(KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW));
input.setIDTokenJWEEnc(EncryptionMethod.A128CBC_HS256);
OIDCClientMetadata output = new OIDCClientMetadata();
- setUpContext(input, output, Collections.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
- Collections.singletonList(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5),
- Collections.singletonList(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256));
+ setUpContext(input, output, CollectionSupport.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
+ CollectionSupport.singletonList(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5),
+ CollectionSupport.singletonList(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256));
ActionTestingSupport.assertEvent(action.execute(requestCtx), EventIds.INVALID_MESSAGE);
}
@@ -169,9 +175,9 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
input.setIDTokenJWEAlg(new JWEAlgorithm(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5));
input.setIDTokenJWEEnc(EncryptionMethod.A128CBC_HS256);
OIDCClientMetadata output = new OIDCClientMetadata();
- setUpContext(input, output, Collections.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
- Collections.singletonList(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5),
- Collections.singletonList(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256));
+ setUpContext(input, output, CollectionSupport.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
+ CollectionSupport.singletonList(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5),
+ CollectionSupport.singletonList(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256));
Assert.assertNull(action.execute(requestCtx));
Assert.assertEquals(output.getIDTokenJWSAlg(), JWSAlgorithm.RS256);
Assert.assertEquals(output.getIDTokenJWEAlg(),
@@ -185,7 +191,8 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
OIDCClientMetadata input = new OIDCClientMetadata();
input.setUserInfoJWSAlg(JWSAlgorithm.RS256);
OIDCClientMetadata output = new OIDCClientMetadata();
- setUpContext(input, output, Collections.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256), null, null);
+ setUpContext(input, output, CollectionSupport.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
+ CollectionSupport.emptyList(), CollectionSupport.emptyList());
Assert.assertNull(action.execute(requestCtx));
Assert.assertEquals(output.getUserInfoJWSAlg(), JWSAlgorithm.RS256);
Assert.assertNull(output.getUserInfoJWEEnc());
@@ -198,8 +205,9 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
input.setUserInfoJWSAlg(JWSAlgorithm.ES512);
OIDCClientMetadata output = new OIDCClientMetadata();
setUpContext(input, output,
- List.of(SignatureConstants.ALGO_ID_SIGNATURE_RS_256, SignatureConstants.ALGO_ID_SIGNATURE_ES_512),
- null, null);
+ CollectionSupport.listOf(SignatureConstants.ALGO_ID_SIGNATURE_RS_256,
+ SignatureConstants.ALGO_ID_SIGNATURE_ES_512),
+ CollectionSupport.emptyList(), CollectionSupport.emptyList());
Assert.assertNull(action.execute(requestCtx));
Assert.assertEquals(output.getUserInfoJWSAlg(), JWSAlgorithm.ES512);
Assert.assertNull(output.getUserInfoJWEEnc());
@@ -212,7 +220,8 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
input.setUserInfoJWEAlg(null);
input.setUserInfoJWEEnc(EncryptionMethod.A128CBC_HS256);
OIDCClientMetadata output = new OIDCClientMetadata();
- setUpContext(input, output, Collections.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256), null, null);
+ setUpContext(input, output, CollectionSupport.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
+ CollectionSupport.emptyList(), CollectionSupport.emptyList());
ActionTestingSupport.assertEvent(action.execute(requestCtx), EventIds.INVALID_MESSAGE);
}
@@ -222,9 +231,9 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
input.setUserInfoJWEAlg(new JWEAlgorithm(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5));
input.setUserInfoJWEEnc(EncryptionMethod.A256CBC_HS512);
OIDCClientMetadata output = new OIDCClientMetadata();
- setUpContext(input, output, Collections.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
- Collections.singletonList(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5),
- Collections.singletonList(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256));
+ setUpContext(input, output, CollectionSupport.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
+ CollectionSupport.singletonList(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5),
+ CollectionSupport.singletonList(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256));
ActionTestingSupport.assertEvent(action.execute(requestCtx), EventIds.INVALID_MESSAGE);
}
@@ -234,9 +243,9 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
input.setUserInfoJWEAlg(new JWEAlgorithm(KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW));
input.setUserInfoJWEEnc(EncryptionMethod.A128CBC_HS256);
OIDCClientMetadata output = new OIDCClientMetadata();
- setUpContext(input, output, Collections.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
- Collections.singletonList(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5),
- Collections.singletonList(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256));
+ setUpContext(input, output, CollectionSupport.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
+ CollectionSupport.singletonList(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5),
+ CollectionSupport.singletonList(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256));
ActionTestingSupport.assertEvent(action.execute(requestCtx), EventIds.INVALID_MESSAGE);
}
@@ -246,9 +255,9 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
input.setUserInfoJWEAlg(new JWEAlgorithm(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5));
input.setUserInfoJWEEnc(EncryptionMethod.A128CBC_HS256);
OIDCClientMetadata output = new OIDCClientMetadata();
- setUpContext(input, output, Collections.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
- Collections.singletonList(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5),
- Collections.singletonList(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256));
+ setUpContext(input, output, CollectionSupport.singletonList(SignatureConstants.ALGO_ID_SIGNATURE_RS_256),
+ CollectionSupport.singletonList(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5),
+ CollectionSupport.singletonList(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256));
Assert.assertNull(action.execute(requestCtx));
Assert.assertEquals(output.getUserInfoJWEAlg(),
new JWEAlgorithm(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5));
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/RevokeConsentTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/RevokeConsentTest.java
index fec4ff41..2ac50f1b 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/RevokeConsentTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/RevokeConsentTest.java
@@ -17,7 +17,6 @@ package net.shibboleth.idp.plugin.oidc.op.profile.impl;
import net.shibboleth.idp.consent.context.ConsentManagementContext;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.logic.ConstraintViolationException;
import java.net.URI;
import java.security.NoSuchAlgorithmException;
@@ -81,14 +80,4 @@ public class RevokeConsentTest extends BaseOIDCResponseActionTest {
Assert.assertTrue(profileRequestCtx.ensureSubcontext(ConsentManagementContext.class).getRevokeConsent());
}
- /**
- * Test that action does not accept null strategy
- */
- @SuppressWarnings("null")
- @Test(expectedExceptions = ConstraintViolationException.class)
- public void testNullStrategy() throws NoSuchAlgorithmException, ComponentInitializationException {
- action = new RevokeConsent();
- action.setRevokeConsentPredicate(null);
- }
-
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list