[java-oidc-common] branch main updated: JCOMOIDC-60 - JWT class naming convention
Phil Smart
philip.smart at jisc.ac.uk
Wed Jan 11 16:16:42 UTC 2023
This is an automated email from the git hooks/post-receive script.
philsmart 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=394e12cc55a6fb00fbf6c7b38d3dcd0a6c4cb054
The following commit(s) were added to refs/heads/main by this push:
new 394e12c JCOMOIDC-60 - JWT class naming convention
394e12c is described below
commit 394e12cc55a6fb00fbf6c7b38d3dcd0a6c4cb054
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Jan 11 16:16:39 2023 +0000
JCOMOIDC-60 - JWT class naming convention
- Remove JWT prefix from security params context class
- Move class to jose package
https://shibboleth.atlassian.net/browse/JCOMOIDC-60
---
.../net/shibboleth/oidc/jwk/RemoteJwkSetCache.java | 6 +++++
.../context/SecurityParametersContext.java} | 12 +++++-----
.../security/{ => jose}/context/package-info.java | 4 ++--
.../impl/BaseJWTSignatureSecurityHandler.java | 6 ++---
.../oidc/security/impl/EncryptJWTHandler.java | 13 +++++------
.../oidc/security/impl/SignJWTHandler.java | 11 +++++----
.../oidc/security/impl/EncryptJWTHandlerTest.java | 16 ++++++-------
.../oidc/security/impl/SignJWTHandlerTest.java | 10 ++++-----
.../impl/PopulateJWTDecryptionParameters.java | 13 +++++------
.../impl/PopulateJWTEncryptionParameters.java | 14 ++++++------
.../PopulateJWTSignatureSigningParameters.java | 22 +++++++++---------
...pulateJWTSignatureSigningParametersHandler.java | 26 +++++++++++-----------
.../PopulateJWTSignatureValidationParameters.java | 14 ++++++------
...ateJWTSignatureValidationParametersHandler.java | 16 ++++++-------
14 files changed, 93 insertions(+), 90 deletions(-)
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/RemoteJwkSetCache.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/RemoteJwkSetCache.java
index 88e4372..40c8b38 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/RemoteJwkSetCache.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/RemoteJwkSetCache.java
@@ -133,6 +133,8 @@ public class RemoteJwkSetCache extends AbstractIdentifiableInitializableComponen
* @param expires time for disposal of value from cache
*
* @return JWK set, null if not found from the cache and cannot be fetched.
+ *
+ * @since 2.2.0
*/
public JWKSet fetch(@Nonnull final URI uri, @Nonnull final String keyId, @Nonnull final Instant expires) {
return fetch(CONTEXT_NAME, uri, keyId, expires);
@@ -194,6 +196,8 @@ public class RemoteJwkSetCache extends AbstractIdentifiableInitializableComponen
* @param uri value to fetch the JWK set from
* @param expires time (in milliseconds since beginning of epoch) for disposal of value from cache
* @return the JWK set document if fetched successfully, {@code null} otherwise.
+ *
+ * @since 2.2.0
*/
@Nullable private JWKSet fetchAndStore(@Nonnull @NotEmpty final String context, @Nonnull final String cacheKey,
@Nonnull final URI uri, @Nonnull final Instant expires) {
@@ -225,6 +229,8 @@ public class RemoteJwkSetCache extends AbstractIdentifiableInitializableComponen
* @param expires time (in milliseconds since beginning of epoch) for disposal of value from cache
*
* @return JWK set, null if not found from the cache and cannot be fetched.
+ *
+ * @since 2.2.0
*/
@Nullable public JWKSet fetch(@Nonnull @NotEmpty final String context, @Nonnull final URI uri,
@Nonnull final String keyId, @Nonnull final Instant expires) {
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/context/JWTSecurityParametersContext.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/context/SecurityParametersContext.java
similarity index 89%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/context/JWTSecurityParametersContext.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/context/SecurityParametersContext.java
index 0a566a3..2f0c6df 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/context/JWTSecurityParametersContext.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/context/SecurityParametersContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.context;
+package net.shibboleth.oidc.security.jose.context;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -31,7 +31,7 @@ import net.shibboleth.oidc.security.jose.SignatureValidationParameters;
* A context implementation for storing parameter instances for JWT signature signing and validation, and JWT
* encryption and decryption.
*/
-public final class JWTSecurityParametersContext extends BaseContext {
+public final class SecurityParametersContext extends BaseContext {
/** Signature validation parameters. */
@Nullable private SignatureValidationParameters signatureValidationParameters;
@@ -61,7 +61,7 @@ public final class JWTSecurityParametersContext extends BaseContext {
*
* @return this context
*/
- @Nonnull public JWTSecurityParametersContext setSignatureValidationParameters(
+ @Nonnull public SecurityParametersContext setSignatureValidationParameters(
@Nullable final SignatureValidationParameters params) {
signatureValidationParameters = params;
return this;
@@ -83,7 +83,7 @@ public final class JWTSecurityParametersContext extends BaseContext {
*
* @return this context
*/
- @Nonnull public JWTSecurityParametersContext setSignatureSigningParameters(
+ @Nonnull public SecurityParametersContext setSignatureSigningParameters(
@Nullable final SignatureSigningParameters params) {
signatureSigningParameters = params;
return this;
@@ -105,7 +105,7 @@ public final class JWTSecurityParametersContext extends BaseContext {
*
* @return this context
*/
- @Nonnull public JWTSecurityParametersContext setDecryptionParameters(
+ @Nonnull public SecurityParametersContext setDecryptionParameters(
@Nullable final DecryptionParameters params) {
decryptionParameters = params;
return this;
@@ -118,7 +118,7 @@ public final class JWTSecurityParametersContext extends BaseContext {
*
* @return this context
*/
- public JWTSecurityParametersContext setEncryptionParameters(@Nullable final EncryptionParameters params) {
+ public SecurityParametersContext setEncryptionParameters(@Nullable final EncryptionParameters params) {
encryptionParameters = params;
return this;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/context/package-info.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/context/package-info.java
similarity index 91%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/context/package-info.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/context/package-info.java
index 737b813..bd66908 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/context/package-info.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/context/package-info.java
@@ -15,5 +15,5 @@
* limitations under the License.
*/
-/** JWT security contexts .*/
-package net.shibboleth.oidc.security.context;
\ No newline at end of file
+/** JOSE security contexts .*/
+package net.shibboleth.oidc.security.jose.context;
\ No newline at end of file
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseJWTSignatureSecurityHandler.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseJWTSignatureSecurityHandler.java
index 27e19a3..83d04d0 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseJWTSignatureSecurityHandler.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseJWTSignatureSecurityHandler.java
@@ -41,10 +41,10 @@ import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.criterion.ClientInformationCriterion;
import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
import net.shibboleth.oidc.security.criterion.StaticCredentialCriterion;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
@@ -136,8 +136,8 @@ public abstract class BaseJWTSignatureSecurityHandler extends BaseTrustEngineSec
@Override
@Nullable protected TrustEngine<SignedJWT> resolveTrustEngine(final MessageContext messageContext) {
- final JWTSecurityParametersContext secParams =
- messageContext.getSubcontext(JWTSecurityParametersContext.class);
+ final SecurityParametersContext secParams =
+ messageContext.getSubcontext(SecurityParametersContext.class);
if (secParams == null || secParams.getSignatureValidationParameters() == null) {
return null;
}
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/EncryptJWTHandler.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/EncryptJWTHandler.java
index 7ceebb3..bc56e93 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/EncryptJWTHandler.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/EncryptJWTHandler.java
@@ -32,7 +32,6 @@ import org.opensaml.messaging.handler.AbstractMessageHandler;
import org.opensaml.messaging.handler.MessageHandler;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.security.credential.Credential;
-import org.opensaml.xmlsec.context.SecurityParametersContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,8 +47,8 @@ import com.nimbusds.jose.crypto.RSAEncrypter;
import com.nimbusds.jwt.EncryptedJWT;
import com.nimbusds.jwt.JWT;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.jose.EncryptionParameters;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -59,7 +58,7 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
* A {@link MessageHandler} that encrypts a JWT using the {@link EncryptionParameters} found in the
- * {@link JWTSecurityParametersContext}. The {@link Payload} to encrypt is determined by lookup strategy.
+ * {@link SecurityParametersContext}. The {@link Payload} to encrypt is determined by lookup strategy.
* A consumer takes the {@link EncryptedJWT} and updates the correct object in the {@link MessageContext}.
*/
//TODO encrypt action is unpleasent to look at
@@ -69,7 +68,7 @@ public class EncryptJWTHandler extends AbstractMessageHandler {
@Nonnull private final Logger log = LoggerFactory.getLogger(EncryptJWTHandler.class);
/** Strategy used to locate the {@link SecurityParametersContext} to use for signing. */
- @Nonnull private Function<MessageContext, JWTSecurityParametersContext> securityParametersLookupStrategy;
+ @Nonnull private Function<MessageContext, SecurityParametersContext> securityParametersLookupStrategy;
/** Strategy used to locate the payload to encrypt.*/
@NonnullAfterInit private Function<MessageContext, Payload> payloadToEncryptLookupStrategy;
@@ -87,7 +86,7 @@ public class EncryptJWTHandler extends AbstractMessageHandler {
/** Constructor.*/
public EncryptJWTHandler() {
logName = "not-specified";
- securityParametersLookupStrategy = new ChildContextLookup<>(JWTSecurityParametersContext.class);
+ securityParametersLookupStrategy = new ChildContextLookup<>(SecurityParametersContext.class);
}
/**
@@ -133,7 +132,7 @@ public class EncryptJWTHandler extends AbstractMessageHandler {
* @param strategy lookup strategy
*/
public void setSecurityParametersLookupStrategy(
- @Nonnull final Function<MessageContext, JWTSecurityParametersContext> strategy) {
+ @Nonnull final Function<MessageContext, SecurityParametersContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
securityParametersLookupStrategy =
@@ -159,7 +158,7 @@ public class EncryptJWTHandler extends AbstractMessageHandler {
return false;
}
- final JWTSecurityParametersContext secParamCtx =
+ final SecurityParametersContext secParamCtx =
securityParametersLookupStrategy.apply(messageContext);
if (secParamCtx == null) {
log.trace("{} Message context did not contain an encryption parameters context, "
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/SignJWTHandler.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/SignJWTHandler.java
index a64dbbc..98e9b96 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/SignJWTHandler.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/SignJWTHandler.java
@@ -29,7 +29,6 @@ import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.messaging.handler.AbstractMessageHandler;
import org.opensaml.messaging.handler.MessageHandlerException;
import org.opensaml.security.credential.Credential;
-import org.opensaml.xmlsec.context.SecurityParametersContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,9 +46,9 @@ import com.nimbusds.jwt.JWT;
import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.jwt.SignedJWT;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.credential.JWKCredential;
import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -67,7 +66,7 @@ public class SignJWTHandler extends AbstractMessageHandler {
@Nonnull private final Logger log = LoggerFactory.getLogger(SignJWTHandler.class);
/** Strategy used to locate the {@link SecurityParametersContext} to use for signing. */
- @Nonnull private Function<MessageContext, JWTSecurityParametersContext> securityParametersLookupStrategy;
+ @Nonnull private Function<MessageContext, SecurityParametersContext> securityParametersLookupStrategy;
/** A consumer that takes the EncryptedJWT and updates the correct object inside the MessageContext.*/
@NonnullAfterInit private BiConsumer<JWT, MessageContext> jwtUpdateConsumer;
@@ -93,7 +92,7 @@ public class SignJWTHandler extends AbstractMessageHandler {
/** Constructor.*/
public SignJWTHandler() {
logName = "not-specified";
- securityParametersLookupStrategy = new ChildContextLookup<>(JWTSecurityParametersContext.class);
+ securityParametersLookupStrategy = new ChildContextLookup<>(SecurityParametersContext.class);
}
/**
@@ -161,7 +160,7 @@ public class SignJWTHandler extends AbstractMessageHandler {
* @param strategy lookup strategy
*/
public void setSecurityParametersLookupStrategy(
- @Nonnull final Function<MessageContext, JWTSecurityParametersContext> strategy) {
+ @Nonnull final Function<MessageContext, SecurityParametersContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
securityParametersLookupStrategy =
@@ -176,7 +175,7 @@ public class SignJWTHandler extends AbstractMessageHandler {
return false;
}
- final JWTSecurityParametersContext secParamCtx =
+ final SecurityParametersContext secParamCtx =
securityParametersLookupStrategy.apply(messageContext);
if (secParamCtx == null) {
log.debug("{} Message context did not contain a signing parameters context, "
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/EncryptJWTHandlerTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/EncryptJWTHandlerTest.java
index c26a385..e6c363e 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/EncryptJWTHandlerTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/EncryptJWTHandlerTest.java
@@ -55,8 +55,8 @@ import com.nimbusds.openid.connect.sdk.claims.ClaimsSet;
import net.shibboleth.oidc.jwa.support.EncryptionConstants;
import net.shibboleth.oidc.jwa.support.KeyManagementConstants;
import net.shibboleth.oidc.profile.core.OIDCAuthenticationRequest;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.jose.EncryptionParameters;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
/**
* Tests for the {@link EncryptJWTHandler} message handler.
@@ -120,7 +120,7 @@ public class EncryptJWTHandlerTest extends AbstractHandlerTest {
@Test
public void testEncryptRSA_Success() throws Exception {
- final JWTSecurityParametersContext secParamCtx = new JWTSecurityParametersContext();
+ final SecurityParametersContext secParamCtx = new SecurityParametersContext();
final var params = new EncryptionParameters();
params.setDataEncryptionAlgorithm(EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM);
params.setKeyTransportEncryptionAlgorithm(KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256);
@@ -154,7 +154,7 @@ public class EncryptJWTHandlerTest extends AbstractHandlerTest {
@Test
public void testEncryptEC_Success() throws Exception {
- final JWTSecurityParametersContext secParamCtx = new JWTSecurityParametersContext();
+ final SecurityParametersContext secParamCtx = new SecurityParametersContext();
final var params = new EncryptionParameters();
params.setDataEncryptionAlgorithm(EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM);
params.setKeyTransportEncryptionAlgorithm(KeyManagementConstants.ALGO_ID_ALG_ECDH_ES);
@@ -188,7 +188,7 @@ public class EncryptJWTHandlerTest extends AbstractHandlerTest {
@Test
public void testEncryptDirect_Success() throws Exception {
- final JWTSecurityParametersContext secParamCtx = new JWTSecurityParametersContext();
+ final SecurityParametersContext secParamCtx = new SecurityParametersContext();
final var params = new EncryptionParameters();
params.setDataEncryptionAlgorithm(EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM);
params.setKeyTransportEncryptionAlgorithm(KeyManagementConstants.ALGO_ID_ALG_DIR);
@@ -218,7 +218,7 @@ public class EncryptJWTHandlerTest extends AbstractHandlerTest {
@Test
public void testKeyWrap_Success() throws Exception {
- final JWTSecurityParametersContext secParamCtx = new JWTSecurityParametersContext();
+ final SecurityParametersContext secParamCtx = new SecurityParametersContext();
final var params = new EncryptionParameters();
params.setDataEncryptionAlgorithm(EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM);
params.setKeyTransportEncryptionAlgorithm(KeyManagementConstants.ALGO_ID_ALG_AES_256_KW);
@@ -248,7 +248,7 @@ public class EncryptJWTHandlerTest extends AbstractHandlerTest {
@Test(expectedExceptions = MessageHandlerException.class)
public void testEncryptDirect_Fail_WrongAlgorithmForCredential() throws Exception {
- final JWTSecurityParametersContext secParamCtx = new JWTSecurityParametersContext();
+ final SecurityParametersContext secParamCtx = new SecurityParametersContext();
final var params = new EncryptionParameters();
params.setDataEncryptionAlgorithm(EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM);
params.setKeyTransportEncryptionAlgorithm(KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256);
@@ -279,7 +279,7 @@ public class EncryptJWTHandlerTest extends AbstractHandlerTest {
@Test(expectedExceptions = MessageHandlerException.class)
public void testFail_IncorrectParamState() throws Exception {
- final JWTSecurityParametersContext secParamCtx = new JWTSecurityParametersContext();
+ final SecurityParametersContext secParamCtx = new SecurityParametersContext();
final var params = new EncryptionParameters();
params.setDataEncryptionAlgorithm(EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM);
params.setKeyTransportEncryptionAlgorithm(KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256);
@@ -306,7 +306,7 @@ public class EncryptJWTHandlerTest extends AbstractHandlerTest {
@Test(expectedExceptions = MessageHandlerException.class)
public void testEncryptWithUnsupportedAlgorithm() throws Exception {
- final JWTSecurityParametersContext secParamCtx = new JWTSecurityParametersContext();
+ final SecurityParametersContext secParamCtx = new SecurityParametersContext();
final var params = new EncryptionParameters();
params.setKeyTransportEncryptionAlgorithm("NotSupported");
params.setDataEncryptionAlgorithm(EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM);
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/SignJWTHandlerTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/SignJWTHandlerTest.java
index d5ba4e4..c89aae0 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/SignJWTHandlerTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/SignJWTHandlerTest.java
@@ -42,8 +42,8 @@ import com.nimbusds.jwt.SignedJWT;
import com.nimbusds.oauth2.sdk.id.ClientID;
import net.shibboleth.oidc.profile.core.OIDCAuthenticationRequest;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
/**
* Tests for the SignJWT message handler.
@@ -95,7 +95,7 @@ public class SignJWTHandlerTest extends AbstractHandlerTest {
@Test
public void testSignHMAC_Success() throws Exception {
- final JWTSecurityParametersContext secParamCtx = new JWTSecurityParametersContext();
+ final SecurityParametersContext secParamCtx = new SecurityParametersContext();
final var params = new SignatureSigningParameters();
params.setSigningCredential(TestCredentialHelper.createClientSecretCredential(CLIENT_SECRET));
params.setSignatureAlgorithm("HS256");
@@ -113,7 +113,7 @@ public class SignJWTHandlerTest extends AbstractHandlerTest {
@Test(expectedExceptions = Exception.class)
public void testSignHMAC_WrongCredentialType() throws Exception {
- final JWTSecurityParametersContext secParamCtx = new JWTSecurityParametersContext();
+ final SecurityParametersContext secParamCtx = new SecurityParametersContext();
final var params = new SignatureSigningParameters();
params.setSigningCredential(TestCredentialHelper.createClientSecretCredential(CLIENT_SECRET));
params.setSignatureAlgorithm("RS256");
@@ -131,7 +131,7 @@ public class SignJWTHandlerTest extends AbstractHandlerTest {
@Test
public void testSignRS256_Success() throws Exception {
- final JWTSecurityParametersContext secParamCtx = new JWTSecurityParametersContext();
+ final SecurityParametersContext secParamCtx = new SecurityParametersContext();
final var params = new SignatureSigningParameters();
final RSAKey rsaKey = new RSAKeyGenerator(2048)
.keyID("1")
@@ -153,7 +153,7 @@ public class SignJWTHandlerTest extends AbstractHandlerTest {
@Test
public void testSignES256_Success() throws Exception {
- final JWTSecurityParametersContext secParamCtx = new JWTSecurityParametersContext();
+ final SecurityParametersContext secParamCtx = new SecurityParametersContext();
final var params = new SignatureSigningParameters();
final ECKey ecKey = new ECKeyGenerator(Curve.P_256)
.keyID("1")
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTDecryptionParameters.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTDecryptionParameters.java
index 4326730..81e103f 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTDecryptionParameters.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTDecryptionParameters.java
@@ -28,20 +28,19 @@ import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.profile.context.navigate.InboundMessageContextLookup;
import org.opensaml.security.credential.Credential;
-import org.opensaml.xmlsec.context.SecurityParametersContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.criterion.JWTDecryptionConfigurationCriterion;
import net.shibboleth.oidc.security.criterion.StaticCredentialCriterion;
import net.shibboleth.oidc.security.jose.DecryptionConfiguration;
import net.shibboleth.oidc.security.jose.DecryptionParameters;
import net.shibboleth.oidc.security.jose.DecryptionParametersResolver;
import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -50,7 +49,7 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
/**
- * Action that resolves and populates {@link DecryptionParameters} on an {@link JWTSecurityParametersContext}
+ * Action that resolves and populates {@link DecryptionParameters} on an {@link SecurityParametersContext}
* created/accessed via a lookup function, by default on a child of the outbound message context.
*
* <p>The default, per-RelyingParty, and default per-profile {@link EncryptionConfiguration}
@@ -69,7 +68,7 @@ public class PopulateJWTDecryptionParameters extends AbstractProfileAction {
/** Strategy used to look up the {@link SecurityParametersContext} to set the parameters for. */
@Nonnull
- private Function<ProfileRequestContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
+ private Function<ProfileRequestContext,SecurityParametersContext> securityParametersContextLookupStrategy;
/** Strategy used to lookup a per-request {@link DecryptionConfiguration} list. */
@NonnullAfterInit
@@ -87,7 +86,7 @@ public class PopulateJWTDecryptionParameters extends AbstractProfileAction {
public PopulateJWTDecryptionParameters() {
// Create context by default.
securityParametersContextLookupStrategy =
- new ChildContextLookup<>(JWTSecurityParametersContext.class, true).compose(
+ new ChildContextLookup<>(SecurityParametersContext.class, true).compose(
new InboundMessageContextLookup());
relyingPartyContextLookupStrategy = new ChildContextLookup<>(RelyingPartyContext.class);
}
@@ -135,7 +134,7 @@ public class PopulateJWTDecryptionParameters extends AbstractProfileAction {
* @param strategy lookup strategy
*/
public void setSecurityParametersContextLookupStrategy(
- @Nonnull final Function<ProfileRequestContext, JWTSecurityParametersContext> strategy) {
+ @Nonnull final Function<ProfileRequestContext, SecurityParametersContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
securityParametersContextLookupStrategy = Constraint.isNotNull(strategy,
@@ -167,7 +166,7 @@ public class PopulateJWTDecryptionParameters extends AbstractProfileAction {
return;
}
- final JWTSecurityParametersContext paramsCtx =
+ final SecurityParametersContext paramsCtx =
securityParametersContextLookupStrategy.apply(profileRequestContext);
if (paramsCtx == null) {
log.debug("{} No SecurityParametersContext returned by lookup strategy", getLogPrefix());
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTEncryptionParameters.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTEncryptionParameters.java
index 2da6afe..075f4fc 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTEncryptionParameters.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTEncryptionParameters.java
@@ -42,7 +42,6 @@ import net.shibboleth.oidc.metadata.context.OIDCMetadataContext;
import net.shibboleth.oidc.metadata.context.OIDCProviderMetadataContext;
import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
import net.shibboleth.oidc.profile.config.logic.EncryptionOptionalPredicate;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.criterion.ClientInformationCriterion;
import net.shibboleth.oidc.security.criterion.JWTEncryptionConfigurationCriterion;
import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
@@ -50,6 +49,7 @@ import net.shibboleth.oidc.security.criterion.StaticCredentialCriterion;
import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
import net.shibboleth.oidc.security.jose.EncryptionParameters;
import net.shibboleth.oidc.security.jose.EncryptionParametersResolver;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -60,7 +60,7 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
/**
- * Action that resolves and populates {@link EncryptionParameters} on an {@link JWTSecurityParametersContext}
+ * Action that resolves and populates {@link EncryptionParameters} on an {@link SecurityParametersContext}
* created/accessed via a lookup function, by default on a child of the outbound message context.
*
* <p>The resolution process is contingent on the active profile configuration requesting encryption.</p>
@@ -86,9 +86,9 @@ public class PopulateJWTEncryptionParameters extends AbstractProfileAction {
/** Predicate to determine how to proceed if no encryption parameters are resolved. */
@Nonnull private Predicate<ProfileRequestContext> encryptionOptionalPredicate;
- /** Strategy used to look up the {@link JWTSecurityParametersContext} to extract parameters from. */
+ /** Strategy used to look up the {@link SecurityParametersContext} to extract parameters from. */
@Nonnull
- private Function<ProfileRequestContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
+ private Function<ProfileRequestContext,SecurityParametersContext> securityParametersContextLookupStrategy;
/** Strategy used to look up a per-request {@link EncryptionConfiguration} list. */
@NonnullAfterInit
@@ -114,14 +114,14 @@ public class PopulateJWTEncryptionParameters extends AbstractProfileAction {
private boolean encryptionOptional;
/** Context to populate. */
- private JWTSecurityParametersContext encryptionContext;
+ private SecurityParametersContext encryptionContext;
/** Constructor. */
public PopulateJWTEncryptionParameters() {
forFriendlyName = "not-specified";
encryptionOptionalPredicate = new EncryptionOptionalPredicate();
securityParametersContextLookupStrategy =
- new ChildContextLookup<>(JWTSecurityParametersContext.class, true).compose(
+ new ChildContextLookup<>(SecurityParametersContext.class, true).compose(
new OutboundMessageContextLookup());
oidcClientMetadataContextLookupStrategy = new ChildContextLookup<>(OIDCMetadataContext.class);
oidcProviderMetadataContextLookupStrategy = new ChildContextLookup<>(OIDCProviderMetadataContext.class);
@@ -147,7 +147,7 @@ public class PopulateJWTEncryptionParameters extends AbstractProfileAction {
* @param strategy the lookup strategy
*/
public void setSecurityParametersContextLookupStrategy(
- final Function<ProfileRequestContext, JWTSecurityParametersContext> strategy) {
+ final Function<ProfileRequestContext, SecurityParametersContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParameters.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParameters.java
index f9a1f6d..b7cc8fa 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParameters.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParameters.java
@@ -35,10 +35,10 @@ import org.slf4j.LoggerFactory;
import net.shibboleth.oidc.metadata.context.OIDCMetadataContext;
import net.shibboleth.oidc.metadata.context.OIDCProviderMetadataContext;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
import net.shibboleth.oidc.security.jose.SignatureSigningParametersResolver;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -47,7 +47,7 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
/**
- * Action that resolves and populates {@link SignatureSigningParameters} on a {@link JWTSecurityParametersContext}
+ * Action that resolves and populates {@link SignatureSigningParameters} on a {@link SecurityParametersContext}
* created/accessed via a lookup function, by default on the outbound message context.
*
* @event {@link EventIds#PROCEED_EVENT_ID}
@@ -60,13 +60,13 @@ public class PopulateJWTSignatureSigningParameters
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(PopulateJWTSignatureSigningParameters.class);
- /** Strategy used to look up the {@link JWTSecurityParametersContext} to set the parameters for. */
+ /** Strategy used to look up the {@link SecurityParametersContext} to set the parameters for. */
@Nonnull
- private Function<ProfileRequestContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
+ private Function<ProfileRequestContext,SecurityParametersContext> securityParametersContextLookupStrategy;
- /** Strategy used to look up an existing {@link JWTSecurityParametersContext} to copy. */
+ /** Strategy used to look up an existing {@link SecurityParametersContext} to copy. */
@Nullable
- private Function<ProfileRequestContext,JWTSecurityParametersContext> existingParametersContextLookupStrategy;
+ private Function<ProfileRequestContext,SecurityParametersContext> existingParametersContextLookupStrategy;
/** Strategy used to look up a per-request {@link SignatureSigningConfiguration} list. */
@NonnullAfterInit
@@ -98,7 +98,7 @@ public class PopulateJWTSignatureSigningParameters
// Create context by default on the outbound context
securityParametersContextLookupStrategy =
- new ChildContextLookup<>(JWTSecurityParametersContext.class, true).compose(
+ new ChildContextLookup<>(SecurityParametersContext.class, true).compose(
new OutboundMessageContextLookup());
noResultIsError = false;
@@ -129,25 +129,25 @@ public class PopulateJWTSignatureSigningParameters
}
/**
- * Set the strategy used to look up an existing {@link JWTSecurityParametersContext} to copy instead
+ * Set the strategy used to look up an existing {@link SecurityParametersContext} to copy instead
* of actually resolving the parameters to set.
*
* @param strategy lookup strategy
*/
public void setExistingParametersContextLookupStrategy(
- @Nullable final Function<ProfileRequestContext,JWTSecurityParametersContext> strategy) {
+ @Nullable final Function<ProfileRequestContext,SecurityParametersContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
existingParametersContextLookupStrategy = strategy;
}
/**
- * Set the strategy used to look up the {@link JWTSecurityParametersContext} to set the parameters for.
+ * Set the strategy used to look up the {@link SecurityParametersContext} to set the parameters for.
*
* @param strategy lookup strategy
*/
public void setSecurityParametersContextLookupStrategy(
- @Nonnull final Function<ProfileRequestContext,JWTSecurityParametersContext> strategy) {
+ @Nonnull final Function<ProfileRequestContext,SecurityParametersContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
securityParametersContextLookupStrategy = Constraint.isNotNull(strategy,
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParametersHandler.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParametersHandler.java
index 6109084..342106a 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParametersHandler.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParametersHandler.java
@@ -40,7 +40,6 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.oidc.metadata.context.OIDCMetadataContext;
import net.shibboleth.oidc.metadata.context.OIDCProviderMetadataContext;
import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.criterion.ClientInformationCriterion;
import net.shibboleth.oidc.security.criterion.JWTSignatureSigningConfigurationCriterion;
import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
@@ -48,6 +47,7 @@ import net.shibboleth.oidc.security.criterion.StaticCredentialCriterion;
import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
import net.shibboleth.oidc.security.jose.SignatureSigningParametersResolver;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -57,7 +57,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
/**
*
- * Handler that resolves and populates {@link SignatureSigningParameters} on a {@link JWTSecurityParametersContext}
+ * Handler that resolves and populates {@link SignatureSigningParameters} on a {@link SecurityParametersContext}
* created/accessed via a lookup function, by default as an immediate child context of the target
* {@link MessageContext}.
*
@@ -70,11 +70,11 @@ public class PopulateJWTSignatureSigningParametersHandler extends AbstractMessag
@Nonnull
private final Logger log = LoggerFactory.getLogger(PopulateJWTSignatureSigningParametersHandler.class);
- /** Strategy used to look up the {@link JWTSecurityParametersContext} to set the parameters for. */
- @Nonnull private Function<MessageContext, JWTSecurityParametersContext> securityParametersContextLookupStrategy;
+ /** Strategy used to look up the {@link SecurityParametersContext} to set the parameters for. */
+ @Nonnull private Function<MessageContext, SecurityParametersContext> securityParametersContextLookupStrategy;
- /** Strategy used to look up an existing {@link JWTSecurityParametersContext} to copy. */
- @Nullable private Function<MessageContext,JWTSecurityParametersContext> existingParametersContextLookupStrategy;
+ /** Strategy used to look up an existing {@link SecurityParametersContext} to copy. */
+ @Nullable private Function<MessageContext,SecurityParametersContext> existingParametersContextLookupStrategy;
/** Strategy used to look up a per-request {@link SignatureSigningConfiguration} list. */
@NonnullAfterInit
@@ -102,7 +102,7 @@ public class PopulateJWTSignatureSigningParametersHandler extends AbstractMessag
/** Constructor.*/
public PopulateJWTSignatureSigningParametersHandler() {
// Create context by default.
- securityParametersContextLookupStrategy = new ChildContextLookup<>(JWTSecurityParametersContext.class, true);
+ securityParametersContextLookupStrategy = new ChildContextLookup<>(SecurityParametersContext.class, true);
// Locate directly under input context.
oidcClientMetadataContextLookupStrategy = new ChildContextLookup<>(OIDCMetadataContext.class);
// Locate directly under input context.
@@ -128,12 +128,12 @@ public class PopulateJWTSignatureSigningParametersHandler extends AbstractMessag
}
/**
- * Set the strategy used to look up the {@link JWTSecurityParametersContext} to set the parameters for.
+ * Set the strategy used to look up the {@link SecurityParametersContext} to set the parameters for.
*
* @param strategy lookup strategy
*/
public void setSecurityParametersContextLookupStrategy(
- @Nonnull final Function<MessageContext, JWTSecurityParametersContext> strategy) {
+ @Nonnull final Function<MessageContext, SecurityParametersContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
securityParametersContextLookupStrategy =
@@ -179,13 +179,13 @@ public class PopulateJWTSignatureSigningParametersHandler extends AbstractMessag
}
/**
- * Set the strategy used to look up an existing {@link JWTSecurityParametersContext} to copy instead
+ * Set the strategy used to look up an existing {@link SecurityParametersContext} to copy instead
* of actually resolving the parameters to set.
*
* @param strategy lookup strategy
*/
public void setExistingParametersContextLookupStrategy(
- @Nullable final Function<MessageContext,JWTSecurityParametersContext> strategy) {
+ @Nullable final Function<MessageContext,SecurityParametersContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
existingParametersContextLookupStrategy = strategy;
@@ -260,14 +260,14 @@ public class PopulateJWTSignatureSigningParametersHandler extends AbstractMessag
protected void doInvoke(final MessageContext messageContext) throws MessageHandlerException {
log.debug("{} Resolving SignatureSigningParameters for request", getLogPrefix());
- final JWTSecurityParametersContext paramsCtx = securityParametersContextLookupStrategy.apply(messageContext);
+ final SecurityParametersContext paramsCtx = securityParametersContextLookupStrategy.apply(messageContext);
if (paramsCtx == null) {
log.debug("{} No JWTSecurityParametersContext returned by lookup strategy", getLogPrefix());
throw new MessageHandlerException("No JWTSecurityParametersContext returned by lookup strategy");
}
if (existingParametersContextLookupStrategy != null) {
- final JWTSecurityParametersContext existingCtx =
+ final SecurityParametersContext existingCtx =
existingParametersContextLookupStrategy.apply(messageContext);
if (existingCtx != null && existingCtx.getSignatureSigningParameters() != null) {
log.debug("{} Found existing JWTSecurityParametersContext to copy from", getLogPrefix());
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParameters.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParameters.java
index 67aa8a8..de755f0 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParameters.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParameters.java
@@ -32,10 +32,10 @@ import org.opensaml.profile.context.navigate.InboundMessageContextLookup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.jose.SignatureValidationConfiguration;
import net.shibboleth.oidc.security.jose.SignatureValidationParameters;
import net.shibboleth.oidc.security.jose.SignatureValidationParametersResolver;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -43,7 +43,7 @@ import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
- * Action that resolves and populates {@link SignatureValidationParameters} on a {@link JWTSecurityParametersContext}
+ * Action that resolves and populates {@link SignatureValidationParameters} on a {@link SecurityParametersContext}
* created/accessed via a lookup function, by default on the inbound message context.
*
* @event {@link EventIds#PROCEED_EVENT_ID}
@@ -56,9 +56,9 @@ public class PopulateJWTSignatureValidationParameters
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(PopulateJWTSignatureValidationParameters.class);
- /** Strategy used to look up the {@link JWTSecurityParametersContext} to set the parameters for. */
+ /** Strategy used to look up the {@link SecurityParametersContext} to set the parameters for. */
@Nonnull
- private Function<ProfileRequestContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
+ private Function<ProfileRequestContext,SecurityParametersContext> securityParametersContextLookupStrategy;
/** Strategy used to lookup a per-request {@link SignatureValidationConfiguration} list. */
@NonnullAfterInit
@@ -78,17 +78,17 @@ public class PopulateJWTSignatureValidationParameters
// Create context by default.
securityParametersContextLookupStrategy =
- new ChildContextLookup<>(JWTSecurityParametersContext.class, true).compose(
+ new ChildContextLookup<>(SecurityParametersContext.class, true).compose(
new InboundMessageContextLookup());
}
/**
- * Set the strategy used to look up the {@link JWTSecurityParametersContext} to set the parameters for.
+ * Set the strategy used to look up the {@link SecurityParametersContext} to set the parameters for.
*
* @param strategy lookup strategy
*/
public void setSecurityParametersContextLookupStrategy(
- @Nonnull final Function<ProfileRequestContext,JWTSecurityParametersContext> strategy) {
+ @Nonnull final Function<ProfileRequestContext,SecurityParametersContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
securityParametersContextLookupStrategy = Constraint.isNotNull(strategy,
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParametersHandler.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParametersHandler.java
index 444024c..563f1cf 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParametersHandler.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureValidationParametersHandler.java
@@ -29,11 +29,11 @@ import org.opensaml.messaging.handler.MessageHandlerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.criterion.JWTSignatureValidationConfigurationCriterion;
import net.shibboleth.oidc.security.jose.SignatureValidationConfiguration;
import net.shibboleth.oidc.security.jose.SignatureValidationParameters;
import net.shibboleth.oidc.security.jose.SignatureValidationParametersResolver;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -44,7 +44,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
/**
* Handler that resolves and populates {@link SignatureValidationParameters} on a
- * {@link JWTSecurityParametersContext} created/accessed via a lookup function, by default as
+ * {@link SecurityParametersContext} created/accessed via a lookup function, by default as
* an immediate child context of the target {@link MessageContext}.
*/
public class PopulateJWTSignatureValidationParametersHandler extends AbstractMessageHandler {
@@ -52,8 +52,8 @@ public class PopulateJWTSignatureValidationParametersHandler extends AbstractMes
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(PopulateJWTSignatureValidationParametersHandler.class);
- /** Strategy used to look up the {@link JWTSecurityParametersContext} to set the parameters for. */
- @Nonnull private Function<MessageContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
+ /** Strategy used to look up the {@link SecurityParametersContext} to set the parameters for. */
+ @Nonnull private Function<MessageContext,SecurityParametersContext> securityParametersContextLookupStrategy;
/** Strategy used to lookup a per-request {@link SignatureValidationConfiguration} list. */
@NonnullAfterInit
@@ -67,16 +67,16 @@ public class PopulateJWTSignatureValidationParametersHandler extends AbstractMes
*/
public PopulateJWTSignatureValidationParametersHandler() {
// Create context by default.
- securityParametersContextLookupStrategy = new ChildContextLookup<>(JWTSecurityParametersContext.class, true);
+ securityParametersContextLookupStrategy = new ChildContextLookup<>(SecurityParametersContext.class, true);
}
/**
- * Set the strategy used to look up the {@link JWTSecurityParametersContext} to set the parameters for.
+ * Set the strategy used to look up the {@link SecurityParametersContext} to set the parameters for.
*
* @param strategy lookup strategy
*/
public void setSecurityParametersContextLookupStrategy(
- @Nonnull final Function<MessageContext, JWTSecurityParametersContext> strategy) {
+ @Nonnull final Function<MessageContext, SecurityParametersContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
securityParametersContextLookupStrategy = Constraint.isNotNull(strategy,
@@ -134,7 +134,7 @@ public class PopulateJWTSignatureValidationParametersHandler extends AbstractMes
throw new MessageHandlerException("No SignatureValidationConfiguration returned by lookup strategy");
}
- final JWTSecurityParametersContext paramsCtx =
+ final SecurityParametersContext paramsCtx =
securityParametersContextLookupStrategy.apply(messageContext);
if (paramsCtx == null) {
log.debug("{} No SecurityParametersContext returned by lookup strategy", getLogPrefix());
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list