[java-idp-oidc] branch main updated: JCOMOIDC-60 - JWT class naming convention
Henri Mikkonen
henri.mikkonen at iki.fi
Wed Jan 11 18:13:43 UTC 2023
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=3a1999b1de1dd4890a8654096181b0aa2196b4b8
The following commit(s) were added to refs/heads/main by this push:
new 3a1999b1 JCOMOIDC-60 - JWT class naming convention
3a1999b1 is described below
commit 3a1999b1de1dd4890a8654096181b0aa2196b4b8
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed Jan 11 20:12:56 2023 +0200
JCOMOIDC-60 - JWT class naming convention
https://shibboleth.atlassian.net/browse/JCOMOIDC-60
Switched into using the new package and class names from commons
---
.../DefaultComputeAuthorizationCodeHashFunction.java | 18 +++++++++---------
.../oidc/op/authn/impl/JWTCredentialValidator.java | 10 +++++-----
.../impl/AlgorithmInfoMetadataValueResolver.java | 16 +++++++---------
.../op/oauth2/profile/impl/ValidateRequestObject.java | 11 +++++------
.../impl/AbstractOIDCSigningResponseAction.java | 17 ++++++++---------
.../impl/FormOutboundKeySetResponseMessage.java | 10 +++++-----
.../flows/authn/OAuth2Client/OAuth2Client-beans.xml | 2 +-
.../idp/flows/oidc/abstract/oidc-abstract-beans.xml | 4 ++--
.../idp/flows/oidc/authorize/authorize-beans.xml | 16 ++++++++--------
.../shibboleth/idp/flows/oidc/token/token-beans.xml | 18 +++++++++---------
.../idp/flows/oidc/userinfo/userinfo-beans.xml | 8 ++++----
.../idp/service/relying-party/postconfig.xml | 12 ++++++------
.../oidc/op/authn/impl/JWTCredentialValidatorTest.java | 4 ++--
.../profile/impl/AddAccessTokenHashToIDTokenTest.java | 10 +++++-----
.../impl/AddAuthorizationCodeHashToIDTokenTest.java | 10 +++++-----
.../AddSecurityConfigurationToClientMetadataTest.java | 12 ++++++------
.../impl/FormOutboundKeySetResponseMessageTest.java | 6 +++---
17 files changed, 90 insertions(+), 94 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultComputeAuthorizationCodeHashFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultComputeAuthorizationCodeHashFunction.java
index c2e54cdd..613084d1 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultComputeAuthorizationCodeHashFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultComputeAuthorizationCodeHashFunction.java
@@ -31,8 +31,8 @@ import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.oauth2.sdk.AuthorizationCode;
import com.nimbusds.openid.connect.sdk.claims.CodeHash;
-import net.shibboleth.oidc.security.JWTSignatureSigningParameters;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
+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.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -42,7 +42,7 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
* A function that computes a hash value for the authorization code via required configurable lookup function.
- * The signature signing algorithm found in the {@link JWTSecurityParametersContext} is used for calculating the hash.
+ * The signature signing algorithm found in the {@link SecurityParametersContext} is used for calculating the hash.
* The lookup function for the security parameters context is required to be set.
*
* @since 3.2.0
@@ -54,21 +54,21 @@ public class DefaultComputeAuthorizationCodeHashFunction extends AbstractIdentif
@Nonnull private Logger log = LoggerFactory.getLogger(DefaultComputeAuthorizationCodeHashFunction.class);
/**
- * Strategy used to locate the {@link JWTSecurityParametersContext} to use for calculating the code hash.
+ * Strategy used to locate the {@link SecurityParametersContext} to use for calculating the code hash.
*/
@NonnullAfterInit
- private Function<ProfileRequestContext, JWTSecurityParametersContext> securityParametersLookupStrategy;
+ private Function<ProfileRequestContext, SecurityParametersContext> securityParametersLookupStrategy;
/** Strategy used to locate the raw authorization code value (as {@link String}) to use for calculating the hash. */
@NonnullAfterInit private Function<ProfileRequestContext, String> authorizationCodeLookupStrategy;
/**
- * Set the strategy used to locate the {@link JWTSecurityParametersContext} to use.
+ * Set the strategy used to locate the {@link SecurityParametersContext} to use.
*
* @param strategy lookup strategy
*/
public void setSecurityParametersLookupStrategy(
- @Nonnull final Function<ProfileRequestContext, JWTSecurityParametersContext> strategy) {
+ @Nonnull final Function<ProfileRequestContext, SecurityParametersContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
securityParametersLookupStrategy =
@@ -110,12 +110,12 @@ public class DefaultComputeAuthorizationCodeHashFunction extends AbstractIdentif
return null;
}
final AuthorizationCode code = new AuthorizationCode(rawCode);
- final JWTSecurityParametersContext securityParameters = securityParametersLookupStrategy.apply(input);
+ final SecurityParametersContext securityParameters = securityParametersLookupStrategy.apply(input);
if (securityParameters == null || securityParameters.getSignatureSigningParameters() == null) {
log.error("Could not resolve security parameters for calculating the code hash value");
return null;
}
- final JWTSignatureSigningParameters signingParameters = securityParameters.getSignatureSigningParameters();
+ final SignatureSigningParameters signingParameters = securityParameters.getSignatureSigningParameters();
final CodeHash cHash = CodeHash.compute(code, new JWSAlgorithm(signingParameters.getSignatureAlgorithm()),
null);
if (cHash == null || cHash.getValue() == null) {
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidator.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidator.java
index 8d3bdbde..67aadd40 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidator.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidator.java
@@ -33,7 +33,7 @@ import net.shibboleth.oidc.authn.context.OAuth2ClientAuthenticationContext;
import net.shibboleth.oidc.jwt.claims.ClaimsValidator;
import net.shibboleth.oidc.jwt.claims.JWTValidationException;
import net.shibboleth.oidc.profile.config.navigate.ClaimsValidatorLookupFunction;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.ThreadSafeAfterInit;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -68,8 +68,8 @@ public class JWTCredentialValidator extends AbstractCredentialValidator {
/** Strategy that will return {@link OAuth2ClientAuthenticationContext}. */
@Nonnull private Function<ProfileRequestContext,OAuth2ClientAuthenticationContext> clientAuthContextLookupStrategy;
- /** Strategy used to locate the {@link JWTSecurityParametersContext} to use for verification. */
- @Nonnull private Function<ProfileRequestContext,JWTSecurityParametersContext> securityParametersLookupStrategy;
+ /** Strategy used to locate the {@link SecurityParametersContext} to use for verification. */
+ @Nonnull private Function<ProfileRequestContext,SecurityParametersContext> securityParametersLookupStrategy;
/** Strategy used to obtain {@link ClaimsValidator}. */
@Nonnull private Function<ProfileRequestContext,ClaimsValidator> claimsValidatorLookupStrategy;
@@ -83,7 +83,7 @@ public class JWTCredentialValidator extends AbstractCredentialValidator {
clientAuthContextLookupStrategy = new ChildContextLookup<>(OAuth2ClientAuthenticationContext.class).compose(
new ChildContextLookup<>(AuthenticationContext.class));
// PRC -> INBOUND -> SPC
- securityParametersLookupStrategy = new ChildContextLookup<>(JWTSecurityParametersContext.class).compose(
+ securityParametersLookupStrategy = new ChildContextLookup<>(SecurityParametersContext.class).compose(
new InboundMessageContextLookup());
claimsValidatorLookupStrategy = new ClaimsValidatorLookupFunction();
@@ -108,7 +108,7 @@ public class JWTCredentialValidator extends AbstractCredentialValidator {
* @param strategy lookup strategy
*/
public void setSecurityParametersLookupStrategy(
- @Nonnull final Function<ProfileRequestContext,JWTSecurityParametersContext> strategy) {
+ @Nonnull final Function<ProfileRequestContext,SecurityParametersContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
securityParametersLookupStrategy =
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/AlgorithmInfoMetadataValueResolver.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/AlgorithmInfoMetadataValueResolver.java
index d3c2374f..74f08ec6 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/AlgorithmInfoMetadataValueResolver.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/AlgorithmInfoMetadataValueResolver.java
@@ -27,17 +27,15 @@ import javax.annotation.Nullable;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.context.ProfileRequestContext;
-import org.opensaml.xmlsec.EncryptionConfiguration;
-import org.opensaml.xmlsec.SignatureSigningConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.idp.plugin.oidc.op.metadata.resolver.MetadataValueResolver;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration;
-import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
-import net.shibboleth.oidc.security.JWTSignatureSigningConfiguration;
+import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
+import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
+import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -128,15 +126,15 @@ public class AlgorithmInfoMetadataValueResolver extends AbstractIdentifiableInit
return result;
}
- if (!(securityConfig instanceof OIDCSecurityConfiguration)) {
+ if (!(securityConfig instanceof JSONSecurityConfiguration)) {
log.warn("Security configuration class was not expected: {}", securityConfig);
return result;
}
- final OIDCSecurityConfiguration oidcSecurityConfig = (OIDCSecurityConfiguration) securityConfig;
+ final JSONSecurityConfiguration jsonSecurityConfig = (JSONSecurityConfiguration) securityConfig;
final List<String> algorithms;
if (resolveEncryptionAlgs) {
- final JWTEncryptionConfiguration encryptionConfig = oidcSecurityConfig.getJwtEncryptionConfiguration();
+ final EncryptionConfiguration encryptionConfig = jsonSecurityConfig.getJwtEncryptionConfiguration();
if (encryptionConfig != null) {
if (resolveKeyTransportEncAlgs) {
algorithms = encryptionConfig.getKeyTransportEncryptionAlgorithms();
@@ -147,7 +145,7 @@ public class AlgorithmInfoMetadataValueResolver extends AbstractIdentifiableInit
algorithms = new ArrayList<String>();
}
} else {
- final JWTSignatureSigningConfiguration signingConfig = oidcSecurityConfig.getJwtSignatureSigningConfiguration();
+ final SignatureSigningConfiguration signingConfig = jsonSecurityConfig.getJwtSignatureSigningConfiguration();
if (signingConfig != null) {
algorithms = signingConfig.getSignatureAlgorithms();
} else {
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateRequestObject.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateRequestObject.java
index 02ad8315..c1bb10a6 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateRequestObject.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/profile/impl/ValidateRequestObject.java
@@ -27,7 +27,6 @@ import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.profile.context.navigate.InboundMessageContextLookup;
-import org.opensaml.xmlsec.context.SecurityParametersContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,8 +41,8 @@ import com.nimbusds.oauth2.sdk.id.ClientID;
import net.shibboleth.oidc.jwt.claims.ClaimsValidator;
import net.shibboleth.oidc.jwt.claims.JWTValidationException;
import net.shibboleth.oidc.profile.core.OidcEventIds;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.impl.OIDCSignatureValidationParameters;
+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;
@@ -63,7 +62,7 @@ public class ValidateRequestObject extends AbstractOAuthAuthorizationResponseAct
/**
* Strategy used to locate the {@link SecurityParametersContext} to use for signing.
*/
- @Nonnull private Function<ProfileRequestContext, JWTSecurityParametersContext> securityParametersLookupStrategy;
+ @Nonnull private Function<ProfileRequestContext, SecurityParametersContext> securityParametersLookupStrategy;
/** Request Object. */
@Nullable private JWT requestObject;
@@ -76,17 +75,17 @@ public class ValidateRequestObject extends AbstractOAuthAuthorizationResponseAct
/** Constructor. */
public ValidateRequestObject() {
- securityParametersLookupStrategy = new ChildContextLookup<>(JWTSecurityParametersContext.class).compose(
+ securityParametersLookupStrategy = new ChildContextLookup<>(SecurityParametersContext.class).compose(
new InboundMessageContextLookup());
}
/**
- * Set the strategy used to locate the {@link JWTSecurityParametersContext} to use.
+ * Set the strategy used to locate the {@link SecurityParametersContext} to use.
*
* @param strategy lookup strategy
*/
public void setSecurityParametersLookupStrategy(
- @Nonnull final Function<ProfileRequestContext, JWTSecurityParametersContext> strategy) {
+ @Nonnull final Function<ProfileRequestContext, SecurityParametersContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
securityParametersLookupStrategy =
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCSigningResponseAction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCSigningResponseAction.java
index 7a030cfe..569ce563 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCSigningResponseAction.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AbstractOIDCSigningResponseAction.java
@@ -25,12 +25,11 @@ import javax.annotation.Nullable;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.profile.context.navigate.OutboundMessageContextLookup;
-import org.opensaml.xmlsec.context.SecurityParametersContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.oidc.security.JWTSignatureSigningParameters;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
+import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -46,14 +45,14 @@ public abstract class AbstractOIDCSigningResponseAction extends AbstractOIDCResp
/**
* Strategy used to locate the {@link SecurityParametersContext} to use for signing.
*/
- @Nonnull private Function<ProfileRequestContext, JWTSecurityParametersContext> securityParametersLookupStrategy;
+ @Nonnull private Function<ProfileRequestContext, SecurityParametersContext> securityParametersLookupStrategy;
/** The signature signing parameters. */
- @Nullable private JWTSignatureSigningParameters signatureSigningParameters;
+ @Nullable private SignatureSigningParameters signatureSigningParameters;
/** Constructor. */
public AbstractOIDCSigningResponseAction() {
- securityParametersLookupStrategy = new ChildContextLookup<>(JWTSecurityParametersContext.class)
+ securityParametersLookupStrategy = new ChildContextLookup<>(SecurityParametersContext.class)
.compose(new OutboundMessageContextLookup());
}
@@ -63,7 +62,7 @@ public abstract class AbstractOIDCSigningResponseAction extends AbstractOIDCResp
* @param strategy lookup strategy
*/
public void setSecurityParametersLookupStrategy(
- @Nonnull final Function<ProfileRequestContext, JWTSecurityParametersContext> strategy) {
+ @Nonnull final Function<ProfileRequestContext, SecurityParametersContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
securityParametersLookupStrategy =
@@ -75,7 +74,7 @@ public abstract class AbstractOIDCSigningResponseAction extends AbstractOIDCResp
*
* @return the signing parameters
*/
- @Nullable public JWTSignatureSigningParameters getSignatureSigningParameters() {
+ @Nullable public SignatureSigningParameters getSignatureSigningParameters() {
return signatureSigningParameters;
}
@@ -87,7 +86,7 @@ public abstract class AbstractOIDCSigningResponseAction extends AbstractOIDCResp
return false;
}
- final JWTSecurityParametersContext secParamCtx = securityParametersLookupStrategy.apply(profileRequestContext);
+ final SecurityParametersContext secParamCtx = securityParametersLookupStrategy.apply(profileRequestContext);
if (secParamCtx == null) {
log.debug("{} no security parameters context is available", getLogPrefix());
return false;
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java
index 7caab62c..765e9a6c 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java
@@ -43,7 +43,7 @@ import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration;
+import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
import net.shibboleth.oidc.security.impl.CredentialConversionUtil;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -63,7 +63,7 @@ public class FormOutboundKeySetResponseMessage extends AbstractProfileAction {
@Nonnull private Function<ProfileRequestContext, RelyingPartyContext> relyingPartyContextLookupStrategy;
/** Security configuration we look for keys to publish. */
- @Nullable private OIDCSecurityConfiguration secConfiguration;
+ @Nullable private JSONSecurityConfiguration secConfiguration;
/** Constructor. */
public FormOutboundKeySetResponseMessage() {
@@ -109,14 +109,14 @@ public class FormOutboundKeySetResponseMessage extends AbstractProfileAction {
final SecurityConfiguration securityConfig =
rpCtx.getProfileConfig().getSecurityConfiguration(profileRequestContext);
- if (!(securityConfig instanceof OIDCSecurityConfiguration)) {
+ if (!(securityConfig instanceof JSONSecurityConfiguration)) {
log.debug("{} No security configuration associated with the profile configuration of the profile request",
getLogPrefix());
ActionSupport.buildEvent(profileRequestContext, EventIds.INVALID_SEC_CFG);
return false;
}
- secConfiguration = (OIDCSecurityConfiguration) securityConfig;
+ secConfiguration = (JSONSecurityConfiguration) securityConfig;
return true;
}
@@ -128,7 +128,7 @@ public class FormOutboundKeySetResponseMessage extends AbstractProfileAction {
if (signingConfig != null) {
convertAndPublishToList(signingConfig.getSigningCredentials(), publishList);
}
- final EncryptionConfiguration encryptionConfig = secConfiguration.getRequestObjectDecryptionConfiguration();
+ final EncryptionConfiguration encryptionConfig = secConfiguration.getEncryptionConfiguration();
if (encryptionConfig != null) {
convertAndPublishToList(encryptionConfig.getKeyTransportEncryptionCredentials(), publishList);
}
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OAuth2Client/OAuth2Client-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OAuth2Client/OAuth2Client-beans.xml
index 24499df4..85cfc9fc 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OAuth2Client/OAuth2Client-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OAuth2Client/OAuth2Client-beans.xml
@@ -42,7 +42,7 @@
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
</property>
<property name="signatureValidationParametersResolver">
- <bean class="net.shibboleth.oidc.security.impl.BasicJWTSignatureValidationParametersResolver" />
+ <bean class="net.shibboleth.oidc.security.jose.impl.BasicSignatureValidationParametersResolver" />
</property>
<!-- <property name="securityParametersContextLookupStrategy">
<bean parent="shibboleth.Functions.Compose"
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
index 4092176a..6860f8ea 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
@@ -111,12 +111,12 @@
<bean id="shibboleth.oidc.ChildLookup.JWTSecurityParameters"
class="org.opensaml.messaging.context.navigate.ChildContextLookup"
- c:type="#{ T(net.shibboleth.oidc.security.context.JWTSecurityParametersContext) }"
+ c:type="#{ T(net.shibboleth.oidc.security.jose.context.SecurityParametersContext) }"
c:createContext="false" />
<bean id="shibboleth.oidc.ChildLookupOrCreate.JWTSecurityParameters"
class="org.opensaml.messaging.context.navigate.ChildContextLookup"
- c:type="#{ T(net.shibboleth.oidc.security.context.JWTSecurityParametersContext) }"
+ c:type="#{ T(net.shibboleth.oidc.security.jose.context.SecurityParametersContext) }"
c:createContext="true" />
</beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
index f20f124c..fd0b78e4 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
@@ -93,7 +93,7 @@
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
<bean id="JWTDecryptionParametersResolver"
- class="net.shibboleth.oidc.security.impl.DefaultJWTDecryptionParametersResolver" />
+ class="net.shibboleth.oidc.security.jose.impl.DefaultDecryptionParametersResolver" />
<bean id="PopulateRequestObjectSignatureValidationParameters"
class="net.shibboleth.oidc.profile.impl.PopulateJWTSignatureValidationParameters"
@@ -104,7 +104,7 @@
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
</property>
<property name="signatureValidationParametersResolver">
- <bean class="net.shibboleth.oidc.security.impl.BasicJWTSignatureValidationParametersResolver" />
+ <bean class="net.shibboleth.oidc.security.jose.impl.BasicSignatureValidationParametersResolver" />
</property>
</bean>
@@ -425,7 +425,7 @@
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
</property>
<property name="signatureSigningParametersResolver">
- <bean class="net.shibboleth.oidc.security.impl.BasicJWTSignatureSigningParametersResolver" />
+ <bean class="net.shibboleth.oidc.security.jose.impl.BasicSignatureSigningParametersResolver" />
</property>
<property name="securityParametersContextLookupStrategy">
<bean parent="shibboleth.Functions.Compose"
@@ -478,7 +478,7 @@
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
</property>
<property name="signatureSigningParametersResolver">
- <bean class="net.shibboleth.oidc.security.impl.BasicJWTSignatureSigningParametersResolver" />
+ <bean class="net.shibboleth.oidc.security.jose.impl.BasicSignatureSigningParametersResolver" />
</property>
</bean>
@@ -553,7 +553,7 @@
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
</property>
<property name="signatureSigningParametersResolver">
- <bean class="net.shibboleth.oidc.security.impl.BasicJWTSignatureSigningParametersResolver" />
+ <bean class="net.shibboleth.oidc.security.jose.impl.BasicSignatureSigningParametersResolver" />
</property>
</bean>
@@ -570,10 +570,10 @@
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
</property>
<property name="encryptionParametersResolver">
- <bean class="net.shibboleth.oidc.security.impl.DefaultJWTEncryptionParametersResolver">
+ <bean class="net.shibboleth.oidc.security.jose.impl.DefaultEncryptionParametersResolver">
<property name="keyTransportEncryptionAlgorithmsLookupStrategy">
<bean
- class="net.shibboleth.oidc.security.impl.ClientInformationKeyTransportEncryptionAlgorithmsLookupStrategy">
+ class="net.shibboleth.oidc.security.jose.impl.ClientInformationKeyTransportEncryptionAlgorithmsLookupStrategy">
<constructor-arg>
<bean
class="net.shibboleth.oidc.profile.config.navigate.ClientInformationStringValueLookupFunction"
@@ -582,7 +582,7 @@
</bean>
</property>
<property name="dataEncryptionAlgorithmsLookupStrategy">
- <bean class="net.shibboleth.oidc.security.impl.ClientInformationDataEncryptionAlgorithmsLookupStrategy">
+ <bean class="net.shibboleth.oidc.security.jose.impl.ClientInformationDataEncryptionAlgorithmsLookupStrategy">
<constructor-arg>
<bean
class="net.shibboleth.oidc.profile.config.navigate.ClientInformationStringValueLookupFunction"
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
index 2756feed..11b5e3c3 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
@@ -309,7 +309,7 @@
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
</property>
<property name="signatureSigningParametersResolver">
- <bean class="net.shibboleth.oidc.security.impl.BasicJWTSignatureSigningParametersResolver" />
+ <bean class="net.shibboleth.oidc.security.jose.impl.BasicSignatureSigningParametersResolver" />
</property>
<property name="securityParametersContextLookupStrategy">
<bean parent="shibboleth.Functions.Compose"
@@ -378,7 +378,7 @@
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
</property>
<property name="signatureSigningParametersResolver">
- <bean class="net.shibboleth.oidc.security.impl.BasicJWTSignatureSigningParametersResolver" />
+ <bean class="net.shibboleth.oidc.security.jose.impl.BasicSignatureSigningParametersResolver" />
</property>
<property name="securityParametersContextLookupStrategy">
<bean parent="shibboleth.Functions.Compose"
@@ -400,10 +400,10 @@
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
</property>
<property name="encryptionParametersResolver">
- <bean class="net.shibboleth.oidc.security.impl.DefaultJWTEncryptionParametersResolver">
+ <bean class="net.shibboleth.oidc.security.jose.impl.DefaultEncryptionParametersResolver">
<property name="keyTransportEncryptionAlgorithmsLookupStrategy">
<bean
- class="net.shibboleth.oidc.security.impl.ClientInformationKeyTransportEncryptionAlgorithmsLookupStrategy">
+ class="net.shibboleth.oidc.security.jose.impl.ClientInformationKeyTransportEncryptionAlgorithmsLookupStrategy">
<constructor-arg>
<bean
class="net.shibboleth.oidc.profile.config.navigate.ClientInformationStringValueLookupFunction"
@@ -412,7 +412,7 @@
</bean>
</property>
<property name="dataEncryptionAlgorithmsLookupStrategy">
- <bean class="net.shibboleth.oidc.security.impl.ClientInformationDataEncryptionAlgorithmsLookupStrategy">
+ <bean class="net.shibboleth.oidc.security.jose.impl.ClientInformationDataEncryptionAlgorithmsLookupStrategy">
<constructor-arg>
<bean
class="net.shibboleth.oidc.profile.config.navigate.ClientInformationStringValueLookupFunction"
@@ -521,7 +521,7 @@
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
</property>
<property name="signatureSigningParametersResolver">
- <bean class="net.shibboleth.oidc.security.impl.BasicJWTSignatureSigningParametersResolver" />
+ <bean class="net.shibboleth.oidc.security.jose.impl.BasicSignatureSigningParametersResolver" />
</property>
</bean>
@@ -550,10 +550,10 @@
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
</property>
<property name="encryptionParametersResolver">
- <bean class="net.shibboleth.oidc.security.impl.DefaultJWTEncryptionParametersResolver">
+ <bean class="net.shibboleth.oidc.security.jose.impl.DefaultEncryptionParametersResolver">
<property name="keyTransportEncryptionAlgorithmsLookupStrategy">
<bean
- class="net.shibboleth.oidc.security.impl.ClientInformationKeyTransportEncryptionAlgorithmsLookupStrategy">
+ class="net.shibboleth.oidc.security.jose.impl.ClientInformationKeyTransportEncryptionAlgorithmsLookupStrategy">
<constructor-arg>
<bean
class="net.shibboleth.oidc.profile.config.navigate.ClientInformationStringValueLookupFunction"
@@ -562,7 +562,7 @@
</bean>
</property>
<property name="dataEncryptionAlgorithmsLookupStrategy">
- <bean class="net.shibboleth.oidc.security.impl.ClientInformationDataEncryptionAlgorithmsLookupStrategy">
+ <bean class="net.shibboleth.oidc.security.jose.impl.ClientInformationDataEncryptionAlgorithmsLookupStrategy">
<constructor-arg>
<bean
class="net.shibboleth.oidc.profile.config.navigate.ClientInformationStringValueLookupFunction"
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml
index f1f39b66..129653a4 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml
@@ -103,7 +103,7 @@
<bean id="shibboleth.oidc.UserInfoSignatureSigningParametersResolver"
- class="net.shibboleth.oidc.security.impl.BasicJWTSignatureSigningParametersResolver" />
+ class="net.shibboleth.oidc.security.jose.impl.BasicSignatureSigningParametersResolver" />
<bean id="PopulateUserInfoResponseEncryptionParameters"
class="net.shibboleth.oidc.profile.impl.PopulateJWTEncryptionParameters" scope="prototype"
@@ -118,10 +118,10 @@
p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
</property>
<property name="encryptionParametersResolver">
- <bean class="net.shibboleth.oidc.security.impl.DefaultJWTEncryptionParametersResolver">
+ <bean class="net.shibboleth.oidc.security.jose.impl.DefaultEncryptionParametersResolver">
<property name="keyTransportEncryptionAlgorithmsLookupStrategy">
<bean
- class="net.shibboleth.oidc.security.impl.ClientInformationKeyTransportEncryptionAlgorithmsLookupStrategy">
+ class="net.shibboleth.oidc.security.jose.impl.ClientInformationKeyTransportEncryptionAlgorithmsLookupStrategy">
<constructor-arg>
<bean
class="net.shibboleth.oidc.profile.config.navigate.ClientInformationStringValueLookupFunction"
@@ -130,7 +130,7 @@
</bean>
</property>
<property name="dataEncryptionAlgorithmsLookupStrategy">
- <bean class="net.shibboleth.oidc.security.impl.ClientInformationDataEncryptionAlgorithmsLookupStrategy">
+ <bean class="net.shibboleth.oidc.security.jose.impl.ClientInformationDataEncryptionAlgorithmsLookupStrategy">
<constructor-arg>
<bean
class="net.shibboleth.oidc.profile.config.navigate.ClientInformationStringValueLookupFunction"
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index f14604fc..d2cef902 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -16,22 +16,22 @@
signatures and loads the default credentials used.
-->
<bean id="shibboleth.oidc.BasicSignatureValidationConfiguration" abstract="true"
- class="net.shibboleth.oidc.security.impl.BasicJWTSignatureValidationConfiguration"
+ class="net.shibboleth.oidc.security.jose.impl.BasicSignatureValidationConfiguration"
p:includedAlgorithms="#{getObject('shibboleth.oidc.IncludedSignatureAlgorithms')}"
p:excludedAlgorithms="#{getObject('shibboleth.oidc.ExcludedSignatureAlgorithms')}" />
<bean id="shibboleth.oidc.BasicSignatureSigningConfiguration" abstract="true"
- class="net.shibboleth.oidc.security.impl.BasicJWTSignatureSigningConfiguration"
+ class="net.shibboleth.oidc.security.jose.impl.BasicSignatureSigningConfiguration"
p:includedAlgorithms="#{getObject('shibboleth.oidc.IncludedSignatureAlgorithms')}"
p:excludedAlgorithms="#{getObject('shibboleth.oidc.ExcludedSignatureAlgorithms')}" />
<bean id="shibboleth.oidc.BasicEncryptionConfiguration" abstract="true"
- class="net.shibboleth.oidc.security.impl.BasicJWTEncryptionConfiguration"
+ class="net.shibboleth.oidc.security.jose.impl.BasicEncryptionConfiguration"
p:includedAlgorithms="#{getObject('shibboleth.oidc.IncludedEncryptionAlgorithms')}"
p:excludedAlgorithms="#{getObject('shibboleth.oidc.ExcludedEncryptionAlgorithms')}" />
<bean id="shibboleth.oidc.BasicDecryptionConfiguration" abstract="true"
- class="net.shibboleth.oidc.security.impl.BasicJWTDecryptionConfiguration"
+ class="net.shibboleth.oidc.security.jose.impl.BasicDecryptionConfiguration"
p:includedAlgorithms="#{getObject('shibboleth.oidc.IncludedEncryptionAlgorithms')}"
p:excludedAlgorithms="#{getObject('shibboleth.oidc.ExcludedEncryptionAlgorithms')}" />
@@ -710,7 +710,7 @@
-->
<bean id="shibboleth.oidc.DefaultSecurityConfiguration"
- class="net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration">
+ class="net.shibboleth.oidc.profile.config.JSONSecurityConfiguration">
<property name="jwtSignatureSigningConfiguration">
<ref bean="#{'%{idp.oidc.signing.config:shibboleth.oidc.SigningConfiguration}'.trim()}" />
</property>
@@ -932,7 +932,7 @@
<!-- Configuration for publishing key set. -->
<bean id="shibboleth.oidc.PublishKeySetSecurityConfiguration"
- class="net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration">
+ class="net.shibboleth.oidc.profile.config.JSONSecurityConfiguration">
<property name="jwtSignatureSigningConfiguration">
<ref bean="shibboleth.oidc.PublishKeySetSigningConfiguration" />
</property>
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidatorTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidatorTest.java
index d3d898b4..64d629c4 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidatorTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/authn/impl/JWTCredentialValidatorTest.java
@@ -73,7 +73,7 @@ import net.shibboleth.oidc.jwt.claims.ClaimsValidator;
import net.shibboleth.oidc.metadata.context.OIDCMetadataContext;
import net.shibboleth.oidc.profile.oauth2.config.AbstractOAuth2ClientAuthenticableProfileConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenConfiguration;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.oidc.security.jwt.claims.impl.AudienceClaimsValidator;
import net.shibboleth.oidc.security.jwt.claims.impl.ChainingJWTClaimsValidator;
import net.shibboleth.oidc.security.jwt.claims.impl.ExactMatchClaimsValidator;
@@ -136,7 +136,7 @@ public class JWTCredentialValidatorTest extends BaseAuthenticationContextTest {
validator = new JWTCredentialValidator();
validator.setId("test");
- validator.setSecurityParametersLookupStrategy(new ChildContextLookup<>(JWTSecurityParametersContext.class));
+ validator.setSecurityParametersLookupStrategy(new ChildContextLookup<>(SecurityParametersContext.class));
validator.initialize();
action = new ValidateCredentials();
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAccessTokenHashToIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAccessTokenHashToIDTokenTest.java
index 8003a12f..32557a6a 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAccessTokenHashToIDTokenTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAccessTokenHashToIDTokenTest.java
@@ -22,8 +22,8 @@ import java.time.Duration;
import java.time.Instant;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.oidc.security.JWTSignatureSigningParameters;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
+import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.profile.action.EventIds;
@@ -39,11 +39,11 @@ public class AddAccessTokenHashToIDTokenTest extends BaseOIDCResponseActionTest
private AddAccessTokenHashToIDToken action;
- JWTSecurityParametersContext spCtx;
+ SecurityParametersContext spCtx;
private void init(String algo, Credential credential) throws ComponentInitializationException, URISyntaxException {
- spCtx = new JWTSecurityParametersContext();
- final JWTSignatureSigningParameters params = new JWTSignatureSigningParameters();
+ spCtx = new SecurityParametersContext();
+ final SignatureSigningParameters params = new SignatureSigningParameters();
spCtx.setSignatureSigningParameters(params);
params.setSigningCredential(credential);
params.setSignatureAlgorithm(algo);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAuthorizationCodeHashToIDTokenTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAuthorizationCodeHashToIDTokenTest.java
index c50dac00..b8a3cb95 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAuthorizationCodeHashToIDTokenTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/AddAuthorizationCodeHashToIDTokenTest.java
@@ -23,8 +23,8 @@ import java.time.Instant;
import net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.DefaultComputeAuthorizationCodeHashFunction;
import net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.ResponseContextAuthorizationCodeLookupFunction;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
-import net.shibboleth.oidc.security.JWTSignatureSigningParameters;
-import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
+import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
+import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.opensaml.profile.action.EventIds;
@@ -40,12 +40,12 @@ public class AddAuthorizationCodeHashToIDTokenTest extends BaseOIDCResponseActio
private AddAuthorizationCodeHashToIDToken action;
- JWTSecurityParametersContext spCtx;
+ SecurityParametersContext spCtx;
private void init(final String algo, final Credential credential)
throws ComponentInitializationException, URISyntaxException {
- spCtx = new JWTSecurityParametersContext();
- final JWTSignatureSigningParameters params = new JWTSignatureSigningParameters();
+ spCtx = new SecurityParametersContext();
+ final SignatureSigningParameters params = new SignatureSigningParameters();
spCtx.setSignatureSigningParameters(params);
params.setSigningCredential(credential);
params.setSignatureAlgorithm(algo);
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 c8500ecf..cd23cbd2 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
@@ -38,9 +38,9 @@ import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.oidc.jwa.support.EncryptionConstants;
import net.shibboleth.oidc.jwa.support.KeyManagementConstants;
import net.shibboleth.oidc.jwa.support.SignatureConstants;
-import net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration;
-import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
-import net.shibboleth.oidc.security.JWTSignatureSigningConfiguration;
+import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
+import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
+import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
@@ -65,11 +65,11 @@ public class AddSecurityConfigurationToClientMetadataTest extends BaseOIDCClient
final List<String> encyrptionAlgs, final List<String> encryptionEncs) {
final RelyingPartyContext rpCtx = profileRequestCtx.getSubcontext(RelyingPartyContext.class);
final ProfileConfiguration profileConfig = Mockito.mock(ProfileConfiguration.class);
- final OIDCSecurityConfiguration secConfig = Mockito.mock(OIDCSecurityConfiguration.class);
- final JWTSignatureSigningConfiguration signingConfig = Mockito.mock(JWTSignatureSigningConfiguration.class);
+ final JSONSecurityConfiguration secConfig = Mockito.mock(JSONSecurityConfiguration.class);
+ final SignatureSigningConfiguration signingConfig = Mockito.mock(SignatureSigningConfiguration.class);
Mockito.when(signingConfig.getSignatureAlgorithms()).thenReturn(signingAlgs);
Mockito.when(secConfig.getJwtSignatureSigningConfiguration()).thenReturn(signingConfig);
- final JWTEncryptionConfiguration encryptionConfig = Mockito.mock(JWTEncryptionConfiguration.class);
+ final EncryptionConfiguration encryptionConfig = Mockito.mock(EncryptionConfiguration.class);
Mockito.when(encryptionConfig.getDataEncryptionAlgorithms()).thenReturn(encryptionEncs);
Mockito.when(encryptionConfig.getKeyTransportEncryptionAlgorithms()).thenReturn(encyrptionAlgs);
Mockito.when(secConfig.getJwtEncryptionConfiguration()).thenReturn(encryptionConfig);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessageTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessageTest.java
index 44bb4ee0..3641f000 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessageTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessageTest.java
@@ -30,8 +30,8 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
import net.shibboleth.oidc.profile.config.OIDCPublishKeySetConfiguration;
-import net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.mockito.Mockito;
@@ -93,9 +93,9 @@ public class FormOutboundKeySetResponseMessageTest {
final EncryptionConfiguration decConfig = Mockito.mock(EncryptionConfiguration.class);
Mockito.when(decConfig.getKeyTransportEncryptionCredentials()).thenReturn(encCreds);
- final OIDCSecurityConfiguration secConf = new OIDCSecurityConfiguration();
+ final JSONSecurityConfiguration secConf = new JSONSecurityConfiguration();
secConf.setSignatureSigningConfiguration(signConfig);
- secConf.setRequestObjectDecryptionConfiguration(decConfig);
+ secConf.setEncryptionConfiguration(decConfig);
profileConf = new OIDCPublishKeySetConfiguration();
profileConf.setSecurityConfiguration(secConf);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list