[java-oidc-common] branch main updated: JCOMOIDC-60 - JWT class naming convention
Phil Smart
philip.smart at jisc.ac.uk
Wed Jan 11 10:39:58 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=f5aa452a2056dcc6432fddb0dd91c200219b3c73
The following commit(s) were added to refs/heads/main by this push:
new f5aa452 JCOMOIDC-60 - JWT class naming convention
f5aa452 is described below
commit f5aa452a2056dcc6432fddb0dd91c200219b3c73
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Jan 11 10:39:56 2023 +0000
JCOMOIDC-60 - JWT class naming convention
- Remove JWT prefix from crypto config classes
- Move to jose package
https://shibboleth.atlassian.net/browse/JCOMOIDC-60
---
.../JWTDecryptionConfigurationCriterion.java | 12 ++++----
.../JWTEncryptionConfigurationCriterion.java | 10 +++----
.../JWTSignatureSigningConfigurationCriterion.java | 10 +++----
...TSignatureValidationConfigurationCriterion.java | 12 ++++----
.../DecryptionConfiguration.java} | 4 +--
.../EncryptionConfiguration.java} | 4 +--
.../SignatureSigningConfiguration.java} | 4 +--
.../SignatureValidationConfiguration.java} | 4 +--
...BasicJWTSignatureSigningParametersResolver.java | 6 ++--
...icJWTSignatureValidationParametersResolver.java | 4 +--
...aultDataEncryptionAlgorithmsLookupStrategy.java | 8 +++---
.../DefaultJWTDecryptionParametersResolver.java | 6 ++--
.../DefaultJWTEncryptionParametersResolver.java | 8 +++---
...ransportEncryptionAlgorithmsLookupStrategy.java | 10 +++----
.../impl/BasicDecryptionConfiguration.java} | 10 +++----
.../impl/BasicEncryptionConfiguration.java} | 12 ++++----
.../impl/BasicSignatureSigningConfiguration.java} | 12 ++++----
.../BasicSignatureValidationConfiguration.java} | 10 +++----
...DataEncryptionAlgorithmsLookupStrategyTest.java | 5 ++--
...DefaultJWTEncryptionParametersResolverTest.java | 5 ++--
...portEncryptionAlgorithmsLookupStrategyTest.java | 5 ++--
...DataEncryptionAlgorithmsLookupStrategyTest.java | 5 ++--
...portEncryptionAlgorithmsLookupStrategyTest.java | 5 ++--
.../profile/config/JSONSecurityConfiguration.java | 32 +++++++++++-----------
.../profile/config/OIDCSecurityConfiguration.java | 4 +--
.../JWEDataEncryptionAlgorithmsLookupFunction.java | 6 ++--
...ransportEncryptionAlgorithmsLookupFunction.java | 6 ++--
.../JWSSignatureAlgorithmsLookupFunction.java | 6 ++--
.../JWTDecryptionConfigurationLookupFunction.java | 10 +++----
.../JWTEncryptionConfigurationLookupFunction.java | 10 +++----
...ignatureSigningConfigurationLookupFunction.java | 10 +++----
...atureValidationConfigurationLookupFunction.java | 10 +++----
.../impl/PopulateJWTDecryptionParameters.java | 20 +++++++-------
.../impl/PopulateJWTEncryptionParameters.java | 14 +++++-----
.../PopulateJWTSignatureSigningParameters.java | 7 ++---
...pulateJWTSignatureSigningParametersHandler.java | 12 ++++----
.../PopulateJWTSignatureValidationParameters.java | 10 +++----
...ateJWTSignatureValidationParametersHandler.java | 12 ++++----
.../FormOutboundKeySetResponseMessageTest.java | 8 +++---
39 files changed, 176 insertions(+), 172 deletions(-)
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTDecryptionConfigurationCriterion.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTDecryptionConfigurationCriterion.java
index e021023..b9a3254 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTDecryptionConfigurationCriterion.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTDecryptionConfigurationCriterion.java
@@ -21,7 +21,7 @@ import java.util.List;
import javax.annotation.Nonnull;
-import net.shibboleth.oidc.security.JWTDecryptionConfiguration;
+import net.shibboleth.oidc.security.jose.DecryptionConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
@@ -30,12 +30,12 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.Criterion;
/**
- * Criterion which holds one or more instances of {@link JWTDecryptionConfiguration}.
+ * Criterion which holds one or more instances of {@link DecryptionConfiguration}.
*/
public class JWTDecryptionConfigurationCriterion implements Criterion {
/** The list of configuration instances. */
- @Nonnull @NonnullElements private final List<JWTDecryptionConfiguration> configs;
+ @Nonnull @NonnullElements private final List<DecryptionConfiguration> configs;
/**
* Constructor.
@@ -43,7 +43,7 @@ public class JWTDecryptionConfigurationCriterion implements Criterion {
* @param configurations list of configuration instances
*/
public JWTDecryptionConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
- List<JWTDecryptionConfiguration> configurations) {
+ List<DecryptionConfiguration> configurations) {
configs = List.copyOf(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
@@ -55,7 +55,7 @@ public class JWTDecryptionConfigurationCriterion implements Criterion {
* @param configurations varargs array of configuration instances
*/
public JWTDecryptionConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
- JWTDecryptionConfiguration... configurations) {
+ DecryptionConfiguration... configurations) {
configs = List.of(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
}
@@ -66,7 +66,7 @@ public class JWTDecryptionConfigurationCriterion implements Criterion {
* @return the list of configuration instances
*/
@Nonnull @NonnullElements @NotLive @Unmodifiable @NotEmpty
- public List<JWTDecryptionConfiguration> getConfigurations() {
+ public List<DecryptionConfiguration> getConfigurations() {
return configs;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTEncryptionConfigurationCriterion.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTEncryptionConfigurationCriterion.java
index f50f283..bd907b3 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTEncryptionConfigurationCriterion.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTEncryptionConfigurationCriterion.java
@@ -21,7 +21,7 @@ import java.util.List;
import javax.annotation.Nonnull;
-import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
+import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
@@ -35,7 +35,7 @@ import net.shibboleth.utilities.java.support.resolver.Criterion;
public class JWTEncryptionConfigurationCriterion implements Criterion {
/** The list of configuration instances. */
- @Nonnull @NonnullElements private final List<JWTEncryptionConfiguration> configs;
+ @Nonnull @NonnullElements private final List<EncryptionConfiguration> configs;
/**
* Constructor.
@@ -43,7 +43,7 @@ public class JWTEncryptionConfigurationCriterion implements Criterion {
* @param configurations list of configuration instances
*/
public JWTEncryptionConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
- List<JWTEncryptionConfiguration> configurations) {
+ List<EncryptionConfiguration> configurations) {
configs = List.copyOf(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
@@ -55,7 +55,7 @@ public class JWTEncryptionConfigurationCriterion implements Criterion {
* @param configurations varargs array of configuration instances
*/
public JWTEncryptionConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
- JWTEncryptionConfiguration... configurations) {
+ EncryptionConfiguration... configurations) {
configs = List.of(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
}
@@ -65,7 +65,7 @@ public class JWTEncryptionConfigurationCriterion implements Criterion {
* @return the list of configuration instances
*/
@Nonnull @NonnullElements @NotLive @Unmodifiable @NotEmpty
- public List<JWTEncryptionConfiguration> getConfigurations() {
+ public List<EncryptionConfiguration> getConfigurations() {
return configs;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureSigningConfigurationCriterion.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureSigningConfigurationCriterion.java
index 16490db..20a12d7 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureSigningConfigurationCriterion.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureSigningConfigurationCriterion.java
@@ -21,7 +21,7 @@ import java.util.List;
import javax.annotation.Nonnull;
-import net.shibboleth.oidc.security.JWTSignatureSigningConfiguration;
+import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
@@ -35,7 +35,7 @@ import net.shibboleth.utilities.java.support.resolver.Criterion;
public class JWTSignatureSigningConfigurationCriterion implements Criterion {
/** The list of configuration instances. */
- @Nonnull @NonnullElements private final List<JWTSignatureSigningConfiguration> configs;
+ @Nonnull @NonnullElements private final List<SignatureSigningConfiguration> configs;
/**
* Constructor.
@@ -43,7 +43,7 @@ public class JWTSignatureSigningConfigurationCriterion implements Criterion {
* @param configurations list of configuration instances
*/
public JWTSignatureSigningConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
- List<JWTSignatureSigningConfiguration> configurations) {
+ List<SignatureSigningConfiguration> configurations) {
configs = List.copyOf(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
@@ -55,7 +55,7 @@ public class JWTSignatureSigningConfigurationCriterion implements Criterion {
* @param configurations varargs array of configuration instances
*/
public JWTSignatureSigningConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
- JWTSignatureSigningConfiguration... configurations) {
+ SignatureSigningConfiguration... configurations) {
configs = List.of(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
}
@@ -65,7 +65,7 @@ public class JWTSignatureSigningConfigurationCriterion implements Criterion {
* @return the list of configuration instances
*/
@Nonnull @NonnullElements @NotLive @Unmodifiable @NotEmpty
- public List<JWTSignatureSigningConfiguration> getConfigurations() {
+ public List<SignatureSigningConfiguration> getConfigurations() {
return configs;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureValidationConfigurationCriterion.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureValidationConfigurationCriterion.java
index 2d5c9f6..7f78ccd 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureValidationConfigurationCriterion.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureValidationConfigurationCriterion.java
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
import com.nimbusds.jwt.SignedJWT;
-import net.shibboleth.oidc.security.JWTSignatureValidationConfiguration;
+import net.shibboleth.oidc.security.jose.SignatureValidationConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
@@ -32,13 +32,13 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.Criterion;
/**
- * Criterion which holds one or more instances of {@link JWTSignatureValidationConfiguration}
+ * Criterion which holds one or more instances of {@link SignatureValidationConfiguration}
* for {@link SignedJWT signed JWTs}.
*/
public class JWTSignatureValidationConfigurationCriterion implements Criterion {
/** The list of configuration instances. */
- @Nonnull @NonnullElements private final List<JWTSignatureValidationConfiguration> configs;
+ @Nonnull @NonnullElements private final List<SignatureValidationConfiguration> configs;
/**
* Constructor.
@@ -46,7 +46,7 @@ public class JWTSignatureValidationConfigurationCriterion implements Criterion {
* @param configurations list of configuration instances
*/
public JWTSignatureValidationConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
- List<JWTSignatureValidationConfiguration> configurations) {
+ List<SignatureValidationConfiguration> configurations) {
configs = List.copyOf(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
@@ -58,7 +58,7 @@ public class JWTSignatureValidationConfigurationCriterion implements Criterion {
* @param configurations varargs array of configuration instances
*/
public JWTSignatureValidationConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
- JWTSignatureValidationConfiguration... configurations) {
+ SignatureValidationConfiguration... configurations) {
configs = List.of(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
}
@@ -68,7 +68,7 @@ public class JWTSignatureValidationConfigurationCriterion implements Criterion {
* @return the list of configuration instances
*/
@Nonnull @NonnullElements @NotLive @Unmodifiable @NotEmpty
- public List<JWTSignatureValidationConfiguration> getConfigurations() {
+ public List<SignatureValidationConfiguration> getConfigurations() {
return configs;
}
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTDecryptionConfiguration.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/DecryptionConfiguration.java
similarity index 92%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTDecryptionConfiguration.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/DecryptionConfiguration.java
index fbac81f..6124948 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTDecryptionConfiguration.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/DecryptionConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security;
+package net.shibboleth.oidc.security.jose;
import javax.annotation.Nullable;
@@ -26,7 +26,7 @@ import net.shibboleth.oidc.security.credential.JOSEObjectCredentialResolver;
/**
* The configuration information to use when decrypting encrypted JWTs.
*/
-public interface JWTDecryptionConfiguration extends AlgorithmPolicyConfiguration {
+public interface DecryptionConfiguration extends AlgorithmPolicyConfiguration {
/**
* Get the CredentialResolver to use when processing the encrypted content.
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTEncryptionConfiguration.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/EncryptionConfiguration.java
similarity index 95%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTEncryptionConfiguration.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/EncryptionConfiguration.java
index 95a6e73..470fd16 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTEncryptionConfiguration.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/EncryptionConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security;
+package net.shibboleth.oidc.security.jose;
import java.util.List;
@@ -32,7 +32,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
/**
* The configuration information to use when generating an encrypted JWT.
*/
-public interface JWTEncryptionConfiguration extends AlgorithmPolicyConfiguration {
+public interface EncryptionConfiguration extends AlgorithmPolicyConfiguration {
/**
* Get the list of preferred data encryption algorithm URIs, in preference order.
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureSigningConfiguration.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/SignatureSigningConfiguration.java
similarity index 93%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureSigningConfiguration.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/SignatureSigningConfiguration.java
index 5439a76..4b29272 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureSigningConfiguration.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/SignatureSigningConfiguration.java
@@ -16,7 +16,7 @@
*/
-package net.shibboleth.oidc.security;
+package net.shibboleth.oidc.security.jose;
import java.util.List;
@@ -32,7 +32,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
/**
* The configuration information to use when generating a signed JWT.
*/
-public interface JWTSignatureSigningConfiguration extends AlgorithmPolicyConfiguration {
+public interface SignatureSigningConfiguration extends AlgorithmPolicyConfiguration {
/**
* Get the list of signing credentials to use when signing, in preference order.
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationConfiguration.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/SignatureValidationConfiguration.java
similarity index 90%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationConfiguration.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/SignatureValidationConfiguration.java
index 2cf3c1d..cdc5b9d 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/JWTSignatureValidationConfiguration.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/SignatureValidationConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security;
+package net.shibboleth.oidc.security.jose;
import javax.annotation.Nullable;
@@ -27,7 +27,7 @@ import com.nimbusds.jwt.SignedJWT;
/**
* The configuration information to use when validating a signed JWT.
*/
-public interface JWTSignatureValidationConfiguration extends AlgorithmPolicyConfiguration {
+public interface SignatureValidationConfiguration extends AlgorithmPolicyConfiguration {
/**
* Get the signature trust engine to use.
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureSigningParametersResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureSigningParametersResolver.java
index ded1de9..0062e73 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureSigningParametersResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureSigningParametersResolver.java
@@ -37,10 +37,10 @@ import org.opensaml.xmlsec.impl.BasicSignatureSigningParametersResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.oidc.security.JWTSignatureSigningConfiguration;
import net.shibboleth.oidc.security.JWTSignatureSigningParameters;
import net.shibboleth.oidc.security.JWTSignatureSigningParametersResolver;
import net.shibboleth.oidc.security.criterion.JWTSignatureSigningConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.logic.PredicateSupport;
@@ -249,7 +249,7 @@ public class BasicJWTSignatureSigningParametersResolver
*/
@Nonnull protected List<Credential> getEffectiveSigningCredentials(@Nonnull final CriteriaSet criteria) {
final ArrayList<Credential> accumulator = new ArrayList<>();
- for (final JWTSignatureSigningConfiguration config :
+ for (final SignatureSigningConfiguration config :
criteria.get(JWTSignatureSigningConfigurationCriterion.class).getConfigurations()) {
accumulator.addAll(config.getSigningCredentials());
@@ -269,7 +269,7 @@ public class BasicJWTSignatureSigningParametersResolver
@Nonnull protected List<String> getEffectiveSignatureAlgorithms(@Nonnull final CriteriaSet criteria,
@Nonnull final Predicate<String> includeExcludePredicate) {
final ArrayList<String> accumulator = new ArrayList<>();
- for (final JWTSignatureSigningConfiguration config :
+ for (final SignatureSigningConfiguration config :
criteria.get(JWTSignatureSigningConfigurationCriterion.class).getConfigurations()) {
config.getSignatureAlgorithms()
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureValidationParametersResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureValidationParametersResolver.java
index f68b7e2..9709cfe 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureValidationParametersResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureValidationParametersResolver.java
@@ -30,10 +30,10 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.jwt.SignedJWT;
-import net.shibboleth.oidc.security.JWTSignatureValidationConfiguration;
import net.shibboleth.oidc.security.JWTSignatureValidationParameters;
import net.shibboleth.oidc.security.JWTSignatureValidationParametersResolver;
import net.shibboleth.oidc.security.criterion.JWTSignatureValidationConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.SignatureValidationConfiguration;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -118,7 +118,7 @@ public class BasicJWTSignatureValidationParametersResolver
@Nullable
protected TrustEngine<SignedJWT> resolveSignatureTrustEngine(@Nonnull final CriteriaSet criteria) {
- for (final JWTSignatureValidationConfiguration config : criteria
+ for (final SignatureValidationConfiguration config : criteria
.get(JWTSignatureValidationConfigurationCriterion.class).getConfigurations()) {
if (config.getSignatureTrustEngine() != null) {
return config.getSignatureTrustEngine();
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultDataEncryptionAlgorithmsLookupStrategy.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultDataEncryptionAlgorithmsLookupStrategy.java
index 7cf6f4e..ea96889 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultDataEncryptionAlgorithmsLookupStrategy.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultDataEncryptionAlgorithmsLookupStrategy.java
@@ -26,8 +26,8 @@ import javax.annotation.Nullable;
import org.opensaml.xmlsec.algorithm.AlgorithmRegistry;
-import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
import net.shibboleth.oidc.security.criterion.JWTEncryptionConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
import net.shibboleth.utilities.java.support.logic.PredicateSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -53,10 +53,10 @@ public class DefaultDataEncryptionAlgorithmsLookupStrategy extends AbstractEncry
}
/**
- * Get the data encryption 'enc' algorithms from the {@link JWTEncryptionConfiguration} inside
+ * Get the data encryption 'enc' algorithms from the {@link EncryptionConfiguration} inside
* the criteria set.
*
- * @param criteria to pull out the {@link JWTEncryptionConfiguration}
+ * @param criteria to pull out the {@link EncryptionConfiguration}
* @param includeExcludePredicate the include and exclude predicates to filter the credentials with
*
* @return the data/content encryption algorithms from the configuration, an empty list otherwise
@@ -64,7 +64,7 @@ public class DefaultDataEncryptionAlgorithmsLookupStrategy extends AbstractEncry
@Nonnull protected List<String> getDataEncryptionAlgorithmsFromConfiguration(final CriteriaSet criteria,
final Predicate<String> includeExcludePredicate){
final ArrayList<String> accumulator = new ArrayList<>();
- for (final JWTEncryptionConfiguration config
+ for (final EncryptionConfiguration config
: criteria.get(JWTEncryptionConfigurationCriterion.class).getConfigurations()) {
config.getDataEncryptionAlgorithms()
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultJWTDecryptionParametersResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultJWTDecryptionParametersResolver.java
index 73ecabc..76488e4 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultJWTDecryptionParametersResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultJWTDecryptionParametersResolver.java
@@ -27,11 +27,11 @@ import org.opensaml.xmlsec.impl.AbstractSecurityParametersResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.oidc.security.JWTDecryptionConfiguration;
import net.shibboleth.oidc.security.JWTDecryptionParameters;
import net.shibboleth.oidc.security.JWTDecryptionParametersResolver;
import net.shibboleth.oidc.security.credential.JOSEObjectCredentialResolver;
import net.shibboleth.oidc.security.criterion.JWTDecryptionConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.DecryptionConfiguration;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -96,7 +96,7 @@ public class DefaultJWTDecryptionParametersResolver extends AbstractSecurityPara
@Nullable protected JOSEObjectCredentialResolver resolveKEKCredentialResolver(
@Nonnull final CriteriaSet criteria) {
- for (final JWTDecryptionConfiguration config : criteria.get(JWTDecryptionConfigurationCriterion.class)
+ for (final DecryptionConfiguration config : criteria.get(JWTDecryptionConfigurationCriterion.class)
.getConfigurations()) {
if (config.getKEKCredentialResolver() != null) {
return config.getKEKCredentialResolver();
@@ -115,7 +115,7 @@ public class DefaultJWTDecryptionParametersResolver extends AbstractSecurityPara
@Nullable protected JOSEObjectCredentialResolver resolveContentEncryptionKeyCredentialResolver(
@Nonnull final CriteriaSet criteria) {
- for (final JWTDecryptionConfiguration config : criteria.get(JWTDecryptionConfigurationCriterion.class)
+ for (final DecryptionConfiguration config : criteria.get(JWTDecryptionConfigurationCriterion.class)
.getConfigurations()) {
if (config.getContentEncryptionKeyCredentialResolver() != null) {
return config.getContentEncryptionKeyCredentialResolver();
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultJWTEncryptionParametersResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultJWTEncryptionParametersResolver.java
index fb6cb62..683ddf8 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultJWTEncryptionParametersResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultJWTEncryptionParametersResolver.java
@@ -49,12 +49,12 @@ import com.nimbusds.jose.EncryptionMethod;
import com.nimbusds.jose.JOSEException;
import com.nimbusds.jose.JWEAlgorithm;
-import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
import net.shibboleth.oidc.security.JWTEncryptionParameters;
import net.shibboleth.oidc.security.JWTEncryptionParametersResolver;
import net.shibboleth.oidc.security.credential.JWKCredential;
import net.shibboleth.oidc.security.criterion.JWTEncryptionConfigurationCriterion;
import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -65,7 +65,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
* to various lookup strategies and credential resolvers. Its main purpose is to compose the results.
*
* <p>The set of usable key transport and data encryption algorithms are determined by injected strategies. The set of
- * usable credentials are resolved by {@link CredentialResolver}s found from the {@link JWTEncryptionConfiguration}
+ * usable credentials are resolved by {@link CredentialResolver}s found from the {@link EncryptionConfiguration}
* inside the input {@link CriteriaSet}. Therefore, the {@link JWTEncryptionConfigurationCriterion} must be present
* inside the criteria set, and the resolvers must be configured for any parameters to be returned.</p>
*
@@ -218,7 +218,7 @@ public class DefaultJWTEncryptionParametersResolver extends AbstractSecurityPara
@Nullable protected CredentialResolver resolveKEKCredentialResolver(
@Nonnull final CriteriaSet criteria) {
- for (final JWTEncryptionConfiguration config : criteria.get(JWTEncryptionConfigurationCriterion.class)
+ for (final EncryptionConfiguration config : criteria.get(JWTEncryptionConfigurationCriterion.class)
.getConfigurations()) {
if (config.getKEKCredentialResolver() != null) {
return config.getKEKCredentialResolver();
@@ -236,7 +236,7 @@ public class DefaultJWTEncryptionParametersResolver extends AbstractSecurityPara
@Nullable protected CredentialResolver resolveContentEncryptionKeyCredentialResolver(
@Nonnull final CriteriaSet criteria) {
- for (final JWTEncryptionConfiguration config : criteria.get(JWTEncryptionConfigurationCriterion.class)
+ for (final EncryptionConfiguration config : criteria.get(JWTEncryptionConfigurationCriterion.class)
.getConfigurations()) {
if (config.getContentEncryptionKeyCredentialResolver() != null) {
return config.getContentEncryptionKeyCredentialResolver();
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategy.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategy.java
index e5e0bac..83a4e7e 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategy.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategy.java
@@ -27,14 +27,14 @@ import javax.annotation.Nullable;
import org.opensaml.xmlsec.algorithm.AlgorithmRegistry;
-import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
import net.shibboleth.oidc.security.criterion.JWTEncryptionConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
import net.shibboleth.utilities.java.support.logic.PredicateSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
/**
* A BiFunction that retrieves and filters the key transport encryption algorithms from the
- * {@link JWTEncryptionConfiguration} inside the criteria set. Algorithms are removed (filtered) if not supported
+ * {@link EncryptionConfiguration} inside the criteria set. Algorithms are removed (filtered) if not supported
* by the runtime or are explicitly excluded.
*/
public class DefaultKeyTransportEncryptionAlgorithmsLookupStrategy extends AbstractEncryptionAlgorithmsLookupStrategy {
@@ -56,10 +56,10 @@ public class DefaultKeyTransportEncryptionAlgorithmsLookupStrategy extends Abstr
/**
- * Get the key transport algorithms from the {@link JWTEncryptionConfiguration} inside
+ * Get the key transport algorithms from the {@link EncryptionConfiguration} inside
* the criteria set.
*
- * @param criteria to pull out the {@link JWTEncryptionConfiguration}
+ * @param criteria to pull out the {@link EncryptionConfiguration}
* @param includeExcludePredicate the include and exclude predicates to filter the credentials with
*
* @return the key transport algorithms from the configuration, an empty list otherwise
@@ -70,7 +70,7 @@ public class DefaultKeyTransportEncryptionAlgorithmsLookupStrategy extends Abstr
return Collections.emptyList();
}
final ArrayList<String> accumulator = new ArrayList<>();
- for (final JWTEncryptionConfiguration config
+ for (final EncryptionConfiguration config
: criteria.get(JWTEncryptionConfigurationCriterion.class).getConfigurations()) {
config.getKeyTransportEncryptionAlgorithms()
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTDecryptionConfiguration.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicDecryptionConfiguration.java
similarity index 89%
rename from oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTDecryptionConfiguration.java
rename to oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicDecryptionConfiguration.java
index 09abf1e..c851c73 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTDecryptionConfiguration.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicDecryptionConfiguration.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.impl;
+package net.shibboleth.oidc.security.jose.impl;
import javax.annotation.Nullable;
import org.opensaml.xmlsec.impl.BasicAlgorithmPolicyConfiguration;
-import net.shibboleth.oidc.security.JWTDecryptionConfiguration;
import net.shibboleth.oidc.security.credential.JOSEObjectCredentialResolver;
+import net.shibboleth.oidc.security.jose.DecryptionConfiguration;
/**
- * Basic implementation of {@link JWTDecryptionConfiguration} for handling JWEs.
+ * Basic implementation of {@link DecryptionConfiguration} for handling JWEs.
*/
-public class BasicJWTDecryptionConfiguration
- extends BasicAlgorithmPolicyConfiguration implements JWTDecryptionConfiguration {
+public class BasicDecryptionConfiguration
+ extends BasicAlgorithmPolicyConfiguration implements DecryptionConfiguration {
/** The EncryptedKey's credential resolver. */
@Nullable private JOSEObjectCredentialResolver kekKeyCredentialResolver;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTEncryptionConfiguration.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicEncryptionConfiguration.java
similarity index 92%
rename from oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTEncryptionConfiguration.java
rename to oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicEncryptionConfiguration.java
index f7be589..6dbcc47 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTEncryptionConfiguration.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicEncryptionConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.impl;
+package net.shibboleth.oidc.security.jose.impl;
import java.util.Collections;
import java.util.List;
@@ -26,17 +26,17 @@ import javax.annotation.Nullable;
import org.opensaml.security.credential.CredentialResolver;
import org.opensaml.xmlsec.impl.BasicAlgorithmPolicyConfiguration;
-import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
+import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
- * Basic implementation of {@link JWTEncryptionConfiguration} for handling JWE encryption.
+ * Basic implementation of {@link EncryptionConfiguration} for handling JWE encryption.
*/
-public class BasicJWTEncryptionConfiguration extends BasicAlgorithmPolicyConfiguration
- implements JWTEncryptionConfiguration {
+public class BasicEncryptionConfiguration extends BasicAlgorithmPolicyConfiguration
+ implements EncryptionConfiguration {
/** Data encryption algorithm URIs. */
@Nonnull @NonnullElements private List<String> dataEncryptionAlgorithms;
@@ -51,7 +51,7 @@ public class BasicJWTEncryptionConfiguration extends BasicAlgorithmPolicyConfigu
@Nullable private CredentialResolver contentEncryptionKeyCredentialResolver;
/** Constructor. */
- public BasicJWTEncryptionConfiguration() {
+ public BasicEncryptionConfiguration() {
dataEncryptionAlgorithms = Collections.emptyList();
keyTransportEncryptionAlgorithms = Collections.emptyList();
}
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureSigningConfiguration.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicSignatureSigningConfiguration.java
similarity index 90%
rename from oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureSigningConfiguration.java
rename to oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicSignatureSigningConfiguration.java
index 68e846a..dd3858e 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureSigningConfiguration.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicSignatureSigningConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.impl;
+package net.shibboleth.oidc.security.jose.impl;
import java.util.Collections;
import java.util.List;
@@ -28,7 +28,7 @@ import org.opensaml.xmlsec.impl.BasicAlgorithmPolicyConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.oidc.security.JWTSignatureSigningConfiguration;
+import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
@@ -37,11 +37,11 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
* The configuration information to use when generating an signed JWT.
*/
-public class BasicJWTSignatureSigningConfiguration extends BasicAlgorithmPolicyConfiguration
- implements JWTSignatureSigningConfiguration {
+public class BasicSignatureSigningConfiguration extends BasicAlgorithmPolicyConfiguration
+ implements SignatureSigningConfiguration {
/** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(BasicJWTSignatureSigningConfiguration.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(BasicSignatureSigningConfiguration.class);
/** Signing credentials. */
@Nonnull @NonnullElements private List<Credential> signingCredentials;
@@ -50,7 +50,7 @@ public class BasicJWTSignatureSigningConfiguration extends BasicAlgorithmPolicyC
@Nonnull @NonnullElements private List<String> signatureAlgorithms;
/** Constructor. */
- public BasicJWTSignatureSigningConfiguration() {
+ public BasicSignatureSigningConfiguration() {
signingCredentials = Collections.emptyList();
signatureAlgorithms = Collections.emptyList();
}
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureValidationConfiguration.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicSignatureValidationConfiguration.java
similarity index 81%
rename from oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureValidationConfiguration.java
rename to oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicSignatureValidationConfiguration.java
index 9471a3c..e26e30e 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BasicJWTSignatureValidationConfiguration.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicSignatureValidationConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.impl;
+package net.shibboleth.oidc.security.jose.impl;
import javax.annotation.Nullable;
@@ -24,14 +24,14 @@ import org.opensaml.xmlsec.impl.BasicAlgorithmPolicyConfiguration;
import com.nimbusds.jwt.SignedJWT;
-import net.shibboleth.oidc.security.JWTSignatureValidationConfiguration;
+import net.shibboleth.oidc.security.jose.SignatureValidationConfiguration;
/**
- * Basic implementation of {@link JWTSignatureValidationConfiguration} for signed JWTs.
+ * Basic implementation of {@link SignatureValidationConfiguration} for signed JWTs.
*/
-public class BasicJWTSignatureValidationConfiguration extends BasicAlgorithmPolicyConfiguration
- implements JWTSignatureValidationConfiguration {
+public class BasicSignatureValidationConfiguration extends BasicAlgorithmPolicyConfiguration
+ implements SignatureValidationConfiguration {
/** The signature trust engine to use. */
@Nullable private TrustEngine<SignedJWT> signatureTrustEngine;
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/DefaultDataEncryptionAlgorithmsLookupStrategyTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/DefaultDataEncryptionAlgorithmsLookupStrategyTest.java
index 2f2fdcd..f24d8d2 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/DefaultDataEncryptionAlgorithmsLookupStrategyTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/DefaultDataEncryptionAlgorithmsLookupStrategyTest.java
@@ -34,13 +34,14 @@ import net.shibboleth.oidc.jwa.algorithm.descriptors.EncryptionA192CBCHS384;
import net.shibboleth.oidc.jwa.algorithm.descriptors.EncryptionA256CBCHS512;
import net.shibboleth.oidc.jwa.support.EncryptionConstants;
import net.shibboleth.oidc.security.criterion.JWTEncryptionConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.impl.BasicEncryptionConfiguration;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
public class DefaultDataEncryptionAlgorithmsLookupStrategyTest {
private DefaultDataEncryptionAlgorithmsLookupStrategy strategy;
- private BasicJWTEncryptionConfiguration config;
+ private BasicEncryptionConfiguration config;
private CriteriaSet criteria;
@@ -55,7 +56,7 @@ public class DefaultDataEncryptionAlgorithmsLookupStrategyTest {
algorithmRegistry.register(new EncryptionA256CBCHS512());
algorithmRegistry.register(new EncryptionA192CBCHS384());
- config = new BasicJWTEncryptionConfiguration();
+ config = new BasicEncryptionConfiguration();
config.setDataEncryptionAlgorithms(
List.of(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256,EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM,
EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512, EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384));
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/DefaultJWTEncryptionParametersResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/DefaultJWTEncryptionParametersResolverTest.java
index 8f5ecca..2dcef9c 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/DefaultJWTEncryptionParametersResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/DefaultJWTEncryptionParametersResolverTest.java
@@ -53,6 +53,7 @@ import net.shibboleth.oidc.security.credential.JOSEObjectCredentialResolver;
import net.shibboleth.oidc.security.credential.JWKCredential;
import net.shibboleth.oidc.security.criterion.JWTEncryptionConfigurationCriterion;
import net.shibboleth.oidc.security.criterion.StaticCredentialCriterion;
+import net.shibboleth.oidc.security.jose.impl.BasicEncryptionConfiguration;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -63,7 +64,7 @@ public class DefaultJWTEncryptionParametersResolverTest {
private DefaultJWTEncryptionParametersResolver resolver;
- private BasicJWTEncryptionConfiguration config;
+ private BasicEncryptionConfiguration config;
@BeforeMethod
@@ -120,7 +121,7 @@ public class DefaultJWTEncryptionParametersResolverTest {
private CriteriaSet buildBasicCriteriaSet() throws Exception {
- config = new BasicJWTEncryptionConfiguration();
+ config = new BasicEncryptionConfiguration();
config.setKeyTransportEncryptionAlgorithms(
List.of(KeyManagementConstants.ALGO_ID_ALG_AES_128_KW, KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256,
KeyManagementConstants.ALGO_ID_ALG_ECDH_ES_AES_192_KW, KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP));
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategyTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategyTest.java
index 25cd777..bab5737 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategyTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategyTest.java
@@ -34,13 +34,14 @@ import net.shibboleth.oidc.jwa.algorithm.descriptors.KeyTransportRSAOAEP256;
import net.shibboleth.oidc.jwa.algorithm.descriptors.SymmetricKeyWrapA128KW;
import net.shibboleth.oidc.jwa.support.KeyManagementConstants;
import net.shibboleth.oidc.security.criterion.JWTEncryptionConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.impl.BasicEncryptionConfiguration;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
public class DefaultKeyTransportEncryptionAlgorithmsLookupStrategyTest {
private DefaultKeyTransportEncryptionAlgorithmsLookupStrategy strategy;
- private BasicJWTEncryptionConfiguration config;
+ private BasicEncryptionConfiguration config;
private CriteriaSet criteria;
@@ -55,7 +56,7 @@ public class DefaultKeyTransportEncryptionAlgorithmsLookupStrategyTest {
algorithmRegistry.register(new KeyTransportRSAOAEP());
algorithmRegistry.register(new KeyAgreementECDHES());
- config = new BasicJWTEncryptionConfiguration();
+ config = new BasicEncryptionConfiguration();
config.setKeyTransportEncryptionAlgorithms(
List.of(KeyManagementConstants.ALGO_ID_ALG_AES_128_KW, KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256,
KeyManagementConstants.ALGO_ID_ALG_ECDH_ES, KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP));
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategyTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategyTest.java
index 8411da9..fa12703 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategyTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategyTest.java
@@ -49,13 +49,14 @@ import net.shibboleth.oidc.jwa.algorithm.descriptors.EncryptionA256CBCHS512;
import net.shibboleth.oidc.jwa.support.EncryptionConstants;
import net.shibboleth.oidc.security.criterion.JWTEncryptionConfigurationCriterion;
import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.impl.BasicEncryptionConfiguration;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
public class ProviderMetadataDataEncryptionAlgorithmsLookupStrategyTest {
private ProviderMetadataDataEncryptionAlgorithmsLookupStrategy strategy;
- private BasicJWTEncryptionConfiguration config;
+ private BasicEncryptionConfiguration config;
private CriteriaSet criteria;
@@ -94,7 +95,7 @@ public class ProviderMetadataDataEncryptionAlgorithmsLookupStrategyTest {
algorithmRegistry.register(new EncryptionA256CBCHS512());
algorithmRegistry.register(new EncryptionA192CBCHS384());
- config = new BasicJWTEncryptionConfiguration();
+ config = new BasicEncryptionConfiguration();
config.setDataEncryptionAlgorithms(
List.of(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256,EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM,
EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512, EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384));
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategyTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategyTest.java
index 2fe90f9..79dc5fa 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategyTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/impl/ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategyTest.java
@@ -49,13 +49,14 @@ import net.shibboleth.oidc.jwa.algorithm.descriptors.SymmetricKeyWrapA128KW;
import net.shibboleth.oidc.jwa.support.KeyManagementConstants;
import net.shibboleth.oidc.security.criterion.JWTEncryptionConfigurationCriterion;
import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.impl.BasicEncryptionConfiguration;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
public class ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategyTest {
private ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategy strategy;
- private BasicJWTEncryptionConfiguration config;
+ private BasicEncryptionConfiguration config;
private CriteriaSet criteria;
@@ -94,7 +95,7 @@ public class ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategyTest
algorithmRegistry.register(new KeyTransportRSAOAEP());
algorithmRegistry.register(new KeyAgreementECDHES());
- config = new BasicJWTEncryptionConfiguration();
+ config = new BasicEncryptionConfiguration();
config.setKeyTransportEncryptionAlgorithms(
List.of(KeyManagementConstants.ALGO_ID_ALG_AES_128_KW, KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256,
KeyManagementConstants.ALGO_ID_ALG_ECDH_ES, KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP));
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/JSONSecurityConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/JSONSecurityConfiguration.java
index 52147df..fec5095 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/JSONSecurityConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/JSONSecurityConfiguration.java
@@ -20,10 +20,10 @@ package net.shibboleth.oidc.profile.config;
import javax.annotation.Nullable;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
-import net.shibboleth.oidc.security.JWTDecryptionConfiguration;
-import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
-import net.shibboleth.oidc.security.JWTSignatureSigningConfiguration;
-import net.shibboleth.oidc.security.JWTSignatureValidationConfiguration;
+import net.shibboleth.oidc.security.jose.DecryptionConfiguration;
+import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
+import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
+import net.shibboleth.oidc.security.jose.SignatureValidationConfiguration;
/**
* Class extends SecurityConfiguration to support separate configuration for various encryption and signature
@@ -33,27 +33,27 @@ public class JSONSecurityConfiguration extends SecurityConfiguration {
/** Configuration used when decrypting JWE tokens. */
@Nullable
- private JWTDecryptionConfiguration jwtDecryptConfig;
+ private DecryptionConfiguration jwtDecryptConfig;
/** Configuration used when encrypting JWE tokens. */
@Nullable
- private JWTEncryptionConfiguration jwtEncryptConfig;
+ private EncryptionConfiguration jwtEncryptConfig;
/** Configuration used when JWS tokens. */
@Nullable
- private JWTSignatureSigningConfiguration jwtSignatureSigningConfig;
+ private SignatureSigningConfiguration jwtSignatureSigningConfig;
/** Configuration used when validating JWS signatures. */
@Nullable
- private JWTSignatureValidationConfiguration jwtSignatureValidationConfig;
+ private SignatureValidationConfiguration jwtSignatureValidationConfig;
/**
* Set the configuration used to decrypt JWE tokens.
*
* @param config configuration used when decrypting JWE tokens, or null
*/
- public void setJwtDecryptionConfiguration(@Nullable final JWTDecryptionConfiguration config) {
+ public void setJwtDecryptionConfiguration(@Nullable final DecryptionConfiguration config) {
jwtDecryptConfig = config;
}
@@ -62,7 +62,7 @@ public class JSONSecurityConfiguration extends SecurityConfiguration {
*
* @return configuration used when decrypting id_tokens, or null
*/
- @Nullable public JWTDecryptionConfiguration getJwtDecryptionConfiguration() {
+ @Nullable public DecryptionConfiguration getJwtDecryptionConfiguration() {
return jwtDecryptConfig;
}
@@ -71,7 +71,7 @@ public class JSONSecurityConfiguration extends SecurityConfiguration {
*
* @param config configuration used when encrypting JWE tokens, or null
*/
- public void setJwtEncryptionConfiguration(@Nullable final JWTEncryptionConfiguration config) {
+ public void setJwtEncryptionConfiguration(@Nullable final EncryptionConfiguration config) {
jwtEncryptConfig = config;
}
@@ -80,7 +80,7 @@ public class JSONSecurityConfiguration extends SecurityConfiguration {
*
* @return configuration used when encrypting JWE tokens, or null
*/
- public JWTEncryptionConfiguration getJwtEncryptionConfiguration() {
+ public EncryptionConfiguration getJwtEncryptionConfiguration() {
return jwtEncryptConfig;
}
@@ -89,7 +89,7 @@ public class JSONSecurityConfiguration extends SecurityConfiguration {
*
* @param config used when signing JWS tokens, or null
*/
- public void setJwtSignatureSigningConfiguration(@Nullable final JWTSignatureSigningConfiguration config) {
+ public void setJwtSignatureSigningConfiguration(@Nullable final SignatureSigningConfiguration config) {
jwtSignatureSigningConfig = config;
}
@@ -100,7 +100,7 @@ public class JSONSecurityConfiguration extends SecurityConfiguration {
* @return configuration used when signing JWS tokens, or null
*/
@Nullable
- public JWTSignatureSigningConfiguration getJwtSignatureSigningConfiguration() {
+ public SignatureSigningConfiguration getJwtSignatureSigningConfiguration() {
return jwtSignatureSigningConfig;
}
@@ -109,7 +109,7 @@ public class JSONSecurityConfiguration extends SecurityConfiguration {
*
* @param config used when validating JWS tokens, or null
*/
- public void setJwtSignatureValidationConfiguration(@Nullable final JWTSignatureValidationConfiguration config) {
+ public void setJwtSignatureValidationConfiguration(@Nullable final SignatureValidationConfiguration config) {
jwtSignatureValidationConfig = config;
}
@@ -120,7 +120,7 @@ public class JSONSecurityConfiguration extends SecurityConfiguration {
* @return configuration used when validating JWS tokens, or null
*/
@Nullable
- public JWTSignatureValidationConfiguration getJwtSignatureValidationConfiguration() {
+ public SignatureValidationConfiguration getJwtSignatureValidationConfiguration() {
return jwtSignatureValidationConfig;
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSecurityConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSecurityConfiguration.java
index c5eb41e..c38cdfd 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSecurityConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSecurityConfiguration.java
@@ -23,7 +23,7 @@ import org.opensaml.xmlsec.EncryptionConfiguration;
import org.opensaml.xmlsec.SignatureSigningConfiguration;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
-import net.shibboleth.oidc.security.JWTDecryptionConfiguration;
+import net.shibboleth.oidc.security.jose.DecryptionConfiguration;
/**
* Class extends SecurityConfiguration to support separate configuration for various encryption and signature
@@ -51,7 +51,7 @@ public class OIDCSecurityConfiguration extends SecurityConfiguration {
/** Configuration used when decrypting JWE tokens. */
@Nullable
- private JWTDecryptionConfiguration jwtDecryptConfig;
+ private DecryptionConfiguration jwtDecryptConfig;
/**
* Get the configuration used when decrypting request object information.
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWEDataEncryptionAlgorithmsLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWEDataEncryptionAlgorithmsLookupFunction.java
index 4a300e6..cf1ce80 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWEDataEncryptionAlgorithmsLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWEDataEncryptionAlgorithmsLookupFunction.java
@@ -29,10 +29,10 @@ import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
-import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
+import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
/**
- * A function that returns {@link JWTEncryptionConfiguration#getDataEncryptionAlgorithms()} if it is available in the
+ * A function that returns {@link EncryptionConfiguration#getDataEncryptionAlgorithms()} if it is available in the
* OIDC security configuration of the profile configuration. The profile configuration is fetched from the
* {@link RelyingPartyContext} obtained via a lookup function, by default a child of the {@link ProfileRequestContext}.
*
@@ -53,7 +53,7 @@ public class JWEDataEncryptionAlgorithmsLookupFunction extends AbstractRelyingPa
&& rpc.getProfileConfig().getSecurityConfiguration(input) != null) {
final SecurityConfiguration secConfig = rpc.getProfileConfig().getSecurityConfiguration(input);
if (secConfig instanceof JSONSecurityConfiguration) {
- final JWTEncryptionConfiguration encryptionConfig =
+ final EncryptionConfiguration encryptionConfig =
((JSONSecurityConfiguration) secConfig).getJwtEncryptionConfiguration();
if (encryptionConfig != null && encryptionConfig.getDataEncryptionAlgorithms() != null) {
return encryptionConfig.getDataEncryptionAlgorithms();
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWEKeyTransportEncryptionAlgorithmsLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWEKeyTransportEncryptionAlgorithmsLookupFunction.java
index 06b1fd6..2bf9452 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWEKeyTransportEncryptionAlgorithmsLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWEKeyTransportEncryptionAlgorithmsLookupFunction.java
@@ -29,10 +29,10 @@ import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
-import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
+import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
/**
- * A function that returns {@link JWTEncryptionConfiguration#getKeyTransportEncryptionAlgorithms()} if it is available
+ * A function that returns {@link EncryptionConfiguration#getKeyTransportEncryptionAlgorithms()} if it is available
* in the OIDC security configuration of the profile configuration. The profile configuration is fetched from the
* {@link RelyingPartyContext} obtained via a lookup function, by default a child of the {@link ProfileRequestContext}.
*
@@ -54,7 +54,7 @@ public class JWEKeyTransportEncryptionAlgorithmsLookupFunction
&& rpc.getProfileConfig().getSecurityConfiguration(input) != null) {
final SecurityConfiguration secConfig = rpc.getProfileConfig().getSecurityConfiguration(input);
if (secConfig instanceof JSONSecurityConfiguration) {
- final JWTEncryptionConfiguration encryptionConfig =
+ final EncryptionConfiguration encryptionConfig =
((JSONSecurityConfiguration) secConfig).getJwtEncryptionConfiguration();
if (encryptionConfig != null && encryptionConfig.getKeyTransportEncryptionAlgorithms() != null) {
return encryptionConfig.getKeyTransportEncryptionAlgorithms();
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWSSignatureAlgorithmsLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWSSignatureAlgorithmsLookupFunction.java
index 6f2ceba..0e16f82 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWSSignatureAlgorithmsLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWSSignatureAlgorithmsLookupFunction.java
@@ -29,10 +29,10 @@ import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
-import net.shibboleth.oidc.security.JWTSignatureSigningConfiguration;
+import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
/**
- * A function that returns {@link JWTSignatureSigningConfiguration#getSignatureAlgorithms()} if it is available in the
+ * A function that returns {@link SignatureSigningConfiguration#getSignatureAlgorithms()} if it is available in the
* OIDC security configuration of the profile configuration. The profile configuration is fetched from the
* {@link RelyingPartyContext} obtained via a lookup function, by default a child of the {@link ProfileRequestContext}.
*
@@ -53,7 +53,7 @@ public class JWSSignatureAlgorithmsLookupFunction extends AbstractRelyingPartyLo
&& rpc.getProfileConfig().getSecurityConfiguration(input) != null) {
final SecurityConfiguration secConfig = rpc.getProfileConfig().getSecurityConfiguration(input);
if (secConfig instanceof JSONSecurityConfiguration) {
- final JWTSignatureSigningConfiguration sigConfig =
+ final SignatureSigningConfiguration sigConfig =
((JSONSecurityConfiguration) secConfig).getJwtSignatureSigningConfiguration();
if (sigConfig != null && sigConfig.getSignatureAlgorithms() != null) {
return sigConfig.getSignatureAlgorithms();
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTDecryptionConfigurationLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTDecryptionConfigurationLookupFunction.java
index 5bcfe26..f29b3e5 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTDecryptionConfigurationLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTDecryptionConfigurationLookupFunction.java
@@ -30,10 +30,10 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
-import net.shibboleth.oidc.security.JWTDecryptionConfiguration;
+import net.shibboleth.oidc.security.jose.DecryptionConfiguration;
/**
- * A function that returns a {@link JWTDecryptionConfiguration} list for JWE decrypting by way
+ * A function that returns a {@link DecryptionConfiguration} list for JWE decrypting by way
* of various lookup strategies.
*
* <p>
@@ -43,7 +43,7 @@ import net.shibboleth.oidc.security.JWTDecryptionConfiguration;
* @since 2.2.0
*/
public class JWTDecryptionConfigurationLookupFunction
- extends AbstractRelyingPartyLookupFunction<List<JWTDecryptionConfiguration>> {
+ extends AbstractRelyingPartyLookupFunction<List<DecryptionConfiguration>> {
/** A resolver for default security configurations. */
@Nullable
@@ -61,9 +61,9 @@ public class JWTDecryptionConfigurationLookupFunction
/** {@inheritDoc} */
@Override
@Nullable
- public List<JWTDecryptionConfiguration> apply(@Nullable final ProfileRequestContext input) {
+ public List<DecryptionConfiguration> apply(@Nullable final ProfileRequestContext input) {
- final List<JWTDecryptionConfiguration> configs = new ArrayList<>();
+ final List<DecryptionConfiguration> configs = new ArrayList<>();
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTEncryptionConfigurationLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTEncryptionConfigurationLookupFunction.java
index f4188ff..5ec9600 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTEncryptionConfigurationLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTEncryptionConfigurationLookupFunction.java
@@ -31,10 +31,10 @@ import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFun
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
import net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration;
-import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
+import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
/**
- * A function that returns an {@link JWTEncryptionConfiguration} list for JWT encryption by way
+ * A function that returns an {@link EncryptionConfiguration} list for JWT encryption by way
* of various lookup strategies.
*
* <p>
@@ -44,7 +44,7 @@ import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
* @since 2.2.0
*/
public class JWTEncryptionConfigurationLookupFunction
- extends AbstractRelyingPartyLookupFunction<List<JWTEncryptionConfiguration>> {
+ extends AbstractRelyingPartyLookupFunction<List<EncryptionConfiguration>> {
/** A resolver for default security configurations. */
@Nullable
@@ -62,9 +62,9 @@ public class JWTEncryptionConfigurationLookupFunction
/** {@inheritDoc} */
@Override
@Nullable
- public List<JWTEncryptionConfiguration> apply(@Nullable final ProfileRequestContext input) {
+ public List<EncryptionConfiguration> apply(@Nullable final ProfileRequestContext input) {
- final List<JWTEncryptionConfiguration> configs = new ArrayList<>();
+ final List<EncryptionConfiguration> configs = new ArrayList<>();
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTSignatureSigningConfigurationLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTSignatureSigningConfigurationLookupFunction.java
index 43d697f..d3425b7 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTSignatureSigningConfigurationLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTSignatureSigningConfigurationLookupFunction.java
@@ -30,10 +30,10 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
-import net.shibboleth.oidc.security.JWTSignatureSigningConfiguration;
+import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
/**
- * A function that returns a {@link JWTSignatureSigningConfiguration} list for JWT signing by way of various lookup
+ * A function that returns a {@link SignatureSigningConfiguration} list for JWT signing by way of various lookup
* strategies.
*
* <p>
@@ -43,7 +43,7 @@ import net.shibboleth.oidc.security.JWTSignatureSigningConfiguration;
* @since 2.2.0
*/
public class JWTSignatureSigningConfigurationLookupFunction
- extends AbstractRelyingPartyLookupFunction<List<JWTSignatureSigningConfiguration>> {
+ extends AbstractRelyingPartyLookupFunction<List<SignatureSigningConfiguration>> {
/** A resolver for default security configurations. */
@Nullable
@@ -61,9 +61,9 @@ public class JWTSignatureSigningConfigurationLookupFunction
/** {@inheritDoc} */
@Override
@Nullable
- public List<JWTSignatureSigningConfiguration> apply(@Nullable final ProfileRequestContext input) {
+ public List<SignatureSigningConfiguration> apply(@Nullable final ProfileRequestContext input) {
- final List<JWTSignatureSigningConfiguration> configs = new ArrayList<>();
+ final List<SignatureSigningConfiguration> configs = new ArrayList<>();
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTSignatureValidationConfigurationLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTSignatureValidationConfigurationLookupFunction.java
index ab12beb..9167e52 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTSignatureValidationConfigurationLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/JWTSignatureValidationConfigurationLookupFunction.java
@@ -30,10 +30,10 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
-import net.shibboleth.oidc.security.JWTSignatureValidationConfiguration;
+import net.shibboleth.oidc.security.jose.SignatureValidationConfiguration;
/**
- * A function that returns a {@link JWTSignatureValidationConfiguration} list for JWS validation by way
+ * A function that returns a {@link SignatureValidationConfiguration} list for JWS validation by way
* of various lookup strategies.
*
* <p>
@@ -43,7 +43,7 @@ import net.shibboleth.oidc.security.JWTSignatureValidationConfiguration;
* @since 2.2.0
*/
public class JWTSignatureValidationConfigurationLookupFunction
- extends AbstractRelyingPartyLookupFunction<List<JWTSignatureValidationConfiguration>> {
+ extends AbstractRelyingPartyLookupFunction<List<SignatureValidationConfiguration>> {
/** A resolver for default security configurations. */
@Nullable
@@ -61,9 +61,9 @@ public class JWTSignatureValidationConfigurationLookupFunction
/** {@inheritDoc} */
@Override
@Nullable
- public List<JWTSignatureValidationConfiguration> apply(@Nullable final ProfileRequestContext input) {
+ public List<SignatureValidationConfiguration> apply(@Nullable final ProfileRequestContext input) {
- final List<JWTSignatureValidationConfiguration> configs = new ArrayList<>();
+ final List<SignatureValidationConfiguration> configs = new ArrayList<>();
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
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 7b87e6f..6f99d81 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
@@ -35,13 +35,13 @@ 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.JWTDecryptionConfiguration;
import net.shibboleth.oidc.security.JWTDecryptionParameters;
import net.shibboleth.oidc.security.JWTDecryptionParametersResolver;
-import net.shibboleth.oidc.security.JWTEncryptionConfiguration;
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.EncryptionConfiguration;
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;
@@ -53,7 +53,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
* Action that resolves and populates {@link JWTDecryptionParameters} on an {@link JWTSecurityParametersContext}
* 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 JWTEncryptionConfiguration}
+ * <p>The default, per-RelyingParty, and default per-profile {@link EncryptionConfiguration}
* objects are input to the resolution process, along with any static, symmetric key credentials
* configured on the relying party i.e. the client_secret.</p>
*
@@ -71,9 +71,9 @@ public class PopulateJWTDecryptionParameters extends AbstractProfileAction {
@Nonnull
private Function<ProfileRequestContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
- /** Strategy used to lookup a per-request {@link JWTDecryptionConfiguration} list. */
+ /** Strategy used to lookup a per-request {@link DecryptionConfiguration} list. */
@NonnullAfterInit
- private Function<ProfileRequestContext,List<JWTDecryptionConfiguration>> configurationLookupStrategy;
+ private Function<ProfileRequestContext,List<DecryptionConfiguration>> configurationLookupStrategy;
/** Lookup function for relying party context. */
@Nonnull private Function<ProfileRequestContext,RelyingPartyContext> relyingPartyContextLookupStrategy;
@@ -117,12 +117,12 @@ public class PopulateJWTDecryptionParameters extends AbstractProfileAction {
}
/**
- * Set the strategy used to look up a per-request {@link JWTDecryptionConfiguration} list.
+ * Set the strategy used to look up a per-request {@link DecryptionConfiguration} list.
*
* @param strategy lookup strategy
*/
public void setConfigurationLookupStrategy(
- @Nonnull final Function<ProfileRequestContext, List<JWTDecryptionConfiguration>> strategy) {
+ @Nonnull final Function<ProfileRequestContext, List<DecryptionConfiguration>> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
configurationLookupStrategy = Constraint.isNotNull(strategy,
@@ -160,7 +160,7 @@ public class PopulateJWTDecryptionParameters extends AbstractProfileAction {
log.debug("{} Resolving JWT DecryptionParameters for request", getLogPrefix());
- final List<JWTDecryptionConfiguration> configs = configurationLookupStrategy.apply(profileRequestContext);
+ final List<DecryptionConfiguration> configs = configurationLookupStrategy.apply(profileRequestContext);
if (configs == null || configs.isEmpty()) {
log.error("{} No DecryptionConfigurations returned by lookup strategy", getLogPrefix());
ActionSupport.buildEvent(profileRequestContext, EventIds.INVALID_SEC_CFG);
@@ -192,13 +192,13 @@ public class PopulateJWTDecryptionParameters extends AbstractProfileAction {
* Build the criteria used as input to the {@link JWTDecryptionParametersResolver}.
*
* @param profileRequestContext current profile request context
- * @param configs a list of {@link JWTDecryptionConfiguration}s to add to the criteria set.
+ * @param configs a list of {@link DecryptionConfiguration}s to add to the criteria set.
*
* @return the criteria set to use
*/
@Nonnull
private CriteriaSet buildCriteriaSet(@Nonnull final ProfileRequestContext profileRequestContext,
- final List<JWTDecryptionConfiguration> configs) {
+ final List<DecryptionConfiguration> configs) {
final CriteriaSet criteria = new CriteriaSet();
criteria.add(new JWTDecryptionConfigurationCriterion(configs));
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 5b8c7b9..e533f13 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.JWTEncryptionConfiguration;
import net.shibboleth.oidc.security.JWTEncryptionParameters;
import net.shibboleth.oidc.security.JWTEncryptionParametersResolver;
import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
@@ -50,6 +49,7 @@ import net.shibboleth.oidc.security.criterion.ClientInformationCriterion;
import net.shibboleth.oidc.security.criterion.JWTEncryptionConfigurationCriterion;
import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
import net.shibboleth.oidc.security.criterion.StaticCredentialCriterion;
+import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
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;
@@ -65,7 +65,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
*
* <p>The resolution process is contingent on the active profile configuration requesting encryption.</p>
*
- * <p>The default, per-RelyingParty, and default per-profile {@link JWTEncryptionConfiguration}
+ * <p>The default, per-RelyingParty, and default per-profile {@link EncryptionConfiguration}
* objects are input to the resolution process, along with the relying party's client metadata, any static
* credentials configured on the relying party, and the OpenID Provider metadata (which in most cases
* will be the source of the eventual encryption key)</p>
@@ -90,15 +90,15 @@ public class PopulateJWTEncryptionParameters extends AbstractProfileAction {
@Nonnull
private Function<ProfileRequestContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
- /** Strategy used to look up a per-request {@link JWTEncryptionConfiguration} list. */
+ /** Strategy used to look up a per-request {@link EncryptionConfiguration} list. */
@NonnullAfterInit
- private Function<ProfileRequestContext,List<JWTEncryptionConfiguration>> configurationLookupStrategy;
+ private Function<ProfileRequestContext,List<EncryptionConfiguration>> configurationLookupStrategy;
/** Resolver for parameters to store into context. */
@NonnullAfterInit private JWTEncryptionParametersResolver encParamsresolver;
/** Active configurations to feed into resolver. */
- @Nullable @NonnullElements private List<JWTEncryptionConfiguration> encryptionConfigurations;
+ @Nullable @NonnullElements private List<EncryptionConfiguration> encryptionConfigurations;
/** Strategy used to look up a OIDC client metadata context. */
@Nullable private Function<ProfileRequestContext, OIDCMetadataContext> oidcClientMetadataContextLookupStrategy;
@@ -192,12 +192,12 @@ public class PopulateJWTEncryptionParameters extends AbstractProfileAction {
}
/**
- * Set the strategy used to look up a per-request {@link JWTEncryptionConfiguration} list.
+ * Set the strategy used to look up a per-request {@link EncryptionConfiguration} list.
*
* @param strategy lookup strategy
*/
public void setConfigurationLookupStrategy(
- @Nonnull final Function<ProfileRequestContext, List<JWTEncryptionConfiguration>> strategy) {
+ @Nonnull final Function<ProfileRequestContext, List<EncryptionConfiguration>> 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 139e01b..6136043 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
@@ -30,16 +30,15 @@ import org.opensaml.profile.action.AbstractHandlerDelegatingProfileAction;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.profile.context.navigate.OutboundMessageContextLookup;
-import org.opensaml.xmlsec.SignatureSigningConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.oidc.metadata.context.OIDCMetadataContext;
import net.shibboleth.oidc.metadata.context.OIDCProviderMetadataContext;
-import net.shibboleth.oidc.security.JWTSignatureSigningConfiguration;
import net.shibboleth.oidc.security.JWTSignatureSigningParameters;
import net.shibboleth.oidc.security.JWTSignatureSigningParametersResolver;
import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
+import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
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;
@@ -71,7 +70,7 @@ public class PopulateJWTSignatureSigningParameters
/** Strategy used to look up a per-request {@link SignatureSigningConfiguration} list. */
@NonnullAfterInit
- private Function<ProfileRequestContext, List<JWTSignatureSigningConfiguration>> configurationLookupStrategy;
+ private Function<ProfileRequestContext, List<SignatureSigningConfiguration>> configurationLookupStrategy;
/** Strategy used to look up a OIDC client metadata context. */
@Nullable private Function<ProfileRequestContext, OIDCMetadataContext> oidcClientMetadataContextLookupStrategy;
@@ -161,7 +160,7 @@ public class PopulateJWTSignatureSigningParameters
* @param strategy lookup strategy
*/
public void setConfigurationLookupStrategy(
- @Nonnull final Function<ProfileRequestContext, List<JWTSignatureSigningConfiguration>> strategy) {
+ @Nonnull final Function<ProfileRequestContext, List<SignatureSigningConfiguration>> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
configurationLookupStrategy =
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 c707c06..83fca88 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.JWTSignatureSigningConfiguration;
import net.shibboleth.oidc.security.JWTSignatureSigningParameters;
import net.shibboleth.oidc.security.JWTSignatureSigningParametersResolver;
import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
@@ -48,6 +47,7 @@ import net.shibboleth.oidc.security.criterion.ClientInformationCriterion;
import net.shibboleth.oidc.security.criterion.JWTSignatureSigningConfigurationCriterion;
import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
import net.shibboleth.oidc.security.criterion.StaticCredentialCriterion;
+import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
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;
@@ -76,9 +76,9 @@ public class PopulateJWTSignatureSigningParametersHandler extends AbstractMessag
/** Strategy used to look up an existing {@link JWTSecurityParametersContext} to copy. */
@Nullable private Function<MessageContext,JWTSecurityParametersContext> existingParametersContextLookupStrategy;
- /** Strategy used to look up a per-request {@link JWTSignatureSigningConfiguration} list. */
+ /** Strategy used to look up a per-request {@link SignatureSigningConfiguration} list. */
@NonnullAfterInit
- private Function<MessageContext, List<JWTSignatureSigningConfiguration>> configurationLookupStrategy;
+ private Function<MessageContext, List<SignatureSigningConfiguration>> configurationLookupStrategy;
/** Strategy used to look up a SAML metadata context. */
@Nonnull private Function<MessageContext, SAMLMetadataContext> metadataContextLookupStrategy;
@@ -205,12 +205,12 @@ public class PopulateJWTSignatureSigningParametersHandler extends AbstractMessag
}
/**
- * Set the strategy used to look up a per-request {@link JWTSignatureSigningConfiguration} list.
+ * Set the strategy used to look up a per-request {@link SignatureSigningConfiguration} list.
*
* @param strategy lookup strategy
*/
public void setConfigurationLookupStrategy(
- @Nonnull final Function<MessageContext, List<JWTSignatureSigningConfiguration>> strategy) {
+ @Nonnull final Function<MessageContext, List<SignatureSigningConfiguration>> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
configurationLookupStrategy =
@@ -276,7 +276,7 @@ public class PopulateJWTSignatureSigningParametersHandler extends AbstractMessag
}
}
- final List<JWTSignatureSigningConfiguration> configs = configurationLookupStrategy.apply(messageContext);
+ final List<SignatureSigningConfiguration> configs = configurationLookupStrategy.apply(messageContext);
if (configs == null || configs.isEmpty()) {
log.error("{} No SignatureSigningConfiguration returned by lookup strategy", getLogPrefix());
throw new MessageHandlerException("No SignatureSigningConfiguration returned by lookup strategy");
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 9892572..f445fc4 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.JWTSignatureValidationConfiguration;
import net.shibboleth.oidc.security.JWTSignatureValidationParameters;
import net.shibboleth.oidc.security.JWTSignatureValidationParametersResolver;
import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
+import net.shibboleth.oidc.security.jose.SignatureValidationConfiguration;
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;
@@ -60,9 +60,9 @@ public class PopulateJWTSignatureValidationParameters
@Nonnull
private Function<ProfileRequestContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
- /** Strategy used to lookup a per-request {@link JWTSignatureValidationConfiguration} list. */
+ /** Strategy used to lookup a per-request {@link SignatureValidationConfiguration} list. */
@NonnullAfterInit
- private Function<ProfileRequestContext,List<JWTSignatureValidationConfiguration>> configurationLookupStrategy;
+ private Function<ProfileRequestContext,List<SignatureValidationConfiguration>> configurationLookupStrategy;
/** Resolver for parameters to store into context. */
@NonnullAfterInit private JWTSignatureValidationParametersResolver resolver;
@@ -96,12 +96,12 @@ public class PopulateJWTSignatureValidationParameters
}
/**
- * Set the strategy used to look up a per-request {@link JWTSignatureValidationConfiguration} list.
+ * Set the strategy used to look up a per-request {@link SignatureValidationConfiguration} list.
*
* @param strategy lookup strategy
*/
public void setConfigurationLookupStrategy(
- @Nonnull final Function<ProfileRequestContext,List<JWTSignatureValidationConfiguration>> strategy) {
+ @Nonnull final Function<ProfileRequestContext,List<SignatureValidationConfiguration>> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
configurationLookupStrategy = 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 7ad95d0..b9215c7 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.JWTSignatureValidationConfiguration;
import net.shibboleth.oidc.security.JWTSignatureValidationParameters;
import net.shibboleth.oidc.security.JWTSignatureValidationParametersResolver;
import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.criterion.JWTSignatureValidationConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.SignatureValidationConfiguration;
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;
@@ -55,9 +55,9 @@ public class PopulateJWTSignatureValidationParametersHandler extends AbstractMes
/** Strategy used to look up the {@link JWTSecurityParametersContext} to set the parameters for. */
@Nonnull private Function<MessageContext,JWTSecurityParametersContext> securityParametersContextLookupStrategy;
- /** Strategy used to lookup a per-request {@link JWTSignatureValidationConfiguration} list. */
+ /** Strategy used to lookup a per-request {@link SignatureValidationConfiguration} list. */
@NonnullAfterInit
- private Function<MessageContext,List<JWTSignatureValidationConfiguration>> configurationLookupStrategy;
+ private Function<MessageContext,List<SignatureValidationConfiguration>> configurationLookupStrategy;
/** Resolver for parameters to store into context. */
@NonnullAfterInit private JWTSignatureValidationParametersResolver resolver;
@@ -84,12 +84,12 @@ public class PopulateJWTSignatureValidationParametersHandler extends AbstractMes
}
/**
- * Set the strategy used to look up a per-request {@link JWTSignatureValidationConfiguration} list.
+ * Set the strategy used to look up a per-request {@link SignatureValidationConfiguration} list.
*
* @param strategy lookup strategy
*/
public void setConfigurationLookupStrategy(
- @Nonnull final Function<MessageContext,List<JWTSignatureValidationConfiguration>> strategy) {
+ @Nonnull final Function<MessageContext,List<SignatureValidationConfiguration>> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
configurationLookupStrategy = Constraint.isNotNull(strategy,
@@ -127,7 +127,7 @@ public class PopulateJWTSignatureValidationParametersHandler extends AbstractMes
log.debug("{} Resolving SignatureValidationParameters for request", getLogPrefix());
- final List<JWTSignatureValidationConfiguration> configs =
+ final List<SignatureValidationConfiguration> configs =
configurationLookupStrategy.apply(messageContext);
if (configs == null || configs.isEmpty()) {
log.error("{} No SignatureValidationConfiguration returned by lookup strategy", getLogPrefix());
diff --git a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
index f8ebb33..66064ba 100644
--- a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
+++ b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
@@ -47,10 +47,10 @@ import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
import net.shibboleth.oidc.profile.config.OIDCPublishKeySetConfiguration;
import net.shibboleth.oidc.profile.config.navigate.JWKCredentialsToPublishLookupStrategy;
import net.shibboleth.oidc.profile.messaging.JSONSuccessResponse;
-import net.shibboleth.oidc.security.JWTDecryptionConfiguration;
-import net.shibboleth.oidc.security.JWTSignatureSigningConfiguration;
import net.shibboleth.oidc.security.credential.impl.ReturnAllCollectionJOSEObjectCredentialResolver;
import net.shibboleth.oidc.security.impl.BasicJWKCredentialFactoryBean;
+import net.shibboleth.oidc.security.jose.DecryptionConfiguration;
+import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/** {@link FormOutboundKeySetResponseMessage} unit test. */
@@ -91,9 +91,9 @@ public class FormOutboundKeySetResponseMessageTest {
final List<Credential> encCreds = new ArrayList<>();
encCreds.add(factory.getObject());
- final JWTSignatureSigningConfiguration signConfig = Mockito.mock(JWTSignatureSigningConfiguration.class);
+ final SignatureSigningConfiguration signConfig = Mockito.mock(SignatureSigningConfiguration.class);
Mockito.when(signConfig.getSigningCredentials()).thenReturn(signCreds);
- final JWTDecryptionConfiguration decConfig = Mockito.mock(JWTDecryptionConfiguration.class);
+ final DecryptionConfiguration decConfig = Mockito.mock(DecryptionConfiguration.class);
final ReturnAllCollectionJOSEObjectCredentialResolver resolver = new ReturnAllCollectionJOSEObjectCredentialResolver(encCreds);
Mockito.when(decConfig.getKEKCredentialResolver()).thenReturn(resolver);
final JSONSecurityConfiguration secConf = new JSONSecurityConfiguration();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list