[java-oidc-common] branch main updated: JCOMOIDC-60 - JWT class naming convention
Phil Smart
philip.smart at jisc.ac.uk
Wed Jan 11 17:27:55 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=afddda0ed09ac5a47e8fbe760c3dadf4622ef905
The following commit(s) were added to refs/heads/main by this push:
new afddda0 JCOMOIDC-60 - JWT class naming convention
afddda0 is described below
commit afddda0ed09ac5a47e8fbe760c3dadf4622ef905
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Jan 11 17:27:53 2023 +0000
JCOMOIDC-60 - JWT class naming convention
- Remove JWT prefix from criterion classes
- Move criterion classes to jose package
https://shibboleth.atlassian.net/browse/JCOMOIDC-60
---
.../credential/JOSEObjectCredentialResolver.java | 2 +-
.../criterion/ClientInformationCriterion.java | 2 +-
.../criterion/DecryptionConfigurationCriterion.java} | 12 ++++++------
.../criterion/EncryptionConfigurationCriterion.java} | 14 +++++++-------
.../{ => jose}/criterion/JOSEObjectCriterion.java | 2 +-
.../security/{ => jose}/criterion/JWKSetCriterion.java | 2 +-
.../security/{ => jose}/criterion/KeyIdCriterion.java | 2 +-
.../criterion/ProviderMetadataCriterion.java | 2 +-
.../SignatureSigningConfigurationCriterion.java} | 14 +++++++-------
.../SignatureValidationConfigurationCriterion.java} | 12 ++++++------
.../criterion/StaticCredentialCriterion.java | 2 +-
.../security/{ => jose}/criterion/package-info.java | 2 +-
.../impl/BasicJOSEObjectCredentialResolver.java | 4 ++--
.../impl/ClientInformationCredentialResolver.java | 2 +-
.../credential/impl/CriterionCredentialResolver.java | 2 +-
.../impl/EvaluableKeyIDCredentialCriterion.java | 2 +-
.../impl/ProviderMetadataCredentialResolver.java | 2 +-
.../security/impl/BaseJWTSignatureSecurityHandler.java | 6 +++---
.../oidc/security/impl/BaseSignedJWTTrustEngine.java | 2 +-
.../security/impl/ExplicitKeySignedJWTTrustEngine.java | 2 +-
.../oidc/security/impl/OIDCTokenDecrypter.java | 4 ++--
.../impl/BasicSignatureSigningParametersResolver.java | 12 ++++++------
.../BasicSignatureValidationParametersResolver.java | 10 +++++-----
...ormationDataEncryptionAlgorithmsLookupStrategy.java | 2 +-
...KeyTransportEncryptionAlgorithmsLookupStrategy.java | 2 +-
.../DefaultDataEncryptionAlgorithmsLookupStrategy.java | 4 ++--
.../jose/impl/DefaultDecryptionParametersResolver.java | 12 ++++++------
.../jose/impl/DefaultEncryptionParametersResolver.java | 18 +++++++++---------
...KeyTransportEncryptionAlgorithmsLookupStrategy.java | 6 +++---
...MetadataDataEncryptionAlgorithmsLookupStrategy.java | 2 +-
...KeyTransportEncryptionAlgorithmsLookupStrategy.java | 2 +-
.../impl/BaseMetadataCredentialResolverTest.java | 2 +-
.../impl/ClientInformationCredentialResolverTest.java | 4 ++--
.../impl/LocalJOSEObjectCredentialResolverTest.java | 2 +-
.../impl/ProviderMetadataCredentialResolverTest.java | 4 ++--
...dataDataEncryptionAlgorithmsLookupStrategyTest.java | 6 +++---
...ransportEncryptionAlgorithmsLookupStrategyTest.java | 6 +++---
...aultDataEncryptionAlgorithmsLookupStrategyTest.java | 4 ++--
.../impl/DefaultEncryptionParametersResolverTest.java | 6 +++---
...ransportEncryptionAlgorithmsLookupStrategyTest.java | 4 ++--
.../profile/impl/PopulateJWTDecryptionParameters.java | 6 +++---
.../profile/impl/PopulateJWTEncryptionParameters.java | 10 +++++-----
.../PopulateJWTSignatureSigningParametersHandler.java | 10 +++++-----
...opulateJWTSignatureValidationParametersHandler.java | 4 ++--
44 files changed, 116 insertions(+), 116 deletions(-)
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/credential/JOSEObjectCredentialResolver.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/credential/JOSEObjectCredentialResolver.java
index 576cd19..d225e7f 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/credential/JOSEObjectCredentialResolver.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/credential/JOSEObjectCredentialResolver.java
@@ -21,7 +21,7 @@ import org.opensaml.security.credential.CredentialResolver;
import com.nimbusds.jose.JOSEObject;
-import net.shibboleth.oidc.security.criterion.JOSEObjectCriterion;
+import net.shibboleth.oidc.security.jose.criterion.JOSEObjectCriterion;
/**
* Specialized {@link CredentialResolver} marker interface for resolvers which resolve
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/ClientInformationCriterion.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/ClientInformationCriterion.java
similarity index 97%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/ClientInformationCriterion.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/ClientInformationCriterion.java
index 602a6a8..f999244 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/ClientInformationCriterion.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/ClientInformationCriterion.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.criterion;
+package net.shibboleth.oidc.security.jose.criterion;
import javax.annotation.Nonnull;
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/jose/criterion/DecryptionConfigurationCriterion.java
similarity index 87%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTDecryptionConfigurationCriterion.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/DecryptionConfigurationCriterion.java
index 2b17d04..9429309 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/jose/criterion/DecryptionConfigurationCriterion.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.criterion;
+package net.shibboleth.oidc.security.jose.criterion;
import java.util.List;
@@ -34,7 +34,7 @@ import net.shibboleth.utilities.java.support.resolver.Criterion;
*
* @since 2.2.0
*/
-public class JWTDecryptionConfigurationCriterion implements Criterion {
+public class DecryptionConfigurationCriterion implements Criterion {
/** The list of configuration instances. */
@Nonnull @NonnullElements private final List<DecryptionConfiguration> configs;
@@ -44,7 +44,7 @@ public class JWTDecryptionConfigurationCriterion implements Criterion {
*
* @param configurations list of configuration instances
*/
- public JWTDecryptionConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
+ public DecryptionConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
List<DecryptionConfiguration> configurations) {
configs = List.copyOf(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
@@ -56,7 +56,7 @@ public class JWTDecryptionConfigurationCriterion implements Criterion {
*
* @param configurations varargs array of configuration instances
*/
- public JWTDecryptionConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
+ public DecryptionConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
DecryptionConfiguration... configurations) {
configs = List.of(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
@@ -99,8 +99,8 @@ public class JWTDecryptionConfigurationCriterion implements Criterion {
return false;
}
- if (obj instanceof JWTDecryptionConfigurationCriterion) {
- return configs.equals(((JWTDecryptionConfigurationCriterion) obj).getConfigurations());
+ if (obj instanceof DecryptionConfigurationCriterion) {
+ return configs.equals(((DecryptionConfigurationCriterion) obj).getConfigurations());
}
return false;
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/jose/criterion/EncryptionConfigurationCriterion.java
similarity index 85%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTEncryptionConfigurationCriterion.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/EncryptionConfigurationCriterion.java
index 9f3db6d..08c74d5 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/jose/criterion/EncryptionConfigurationCriterion.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.criterion;
+package net.shibboleth.oidc.security.jose.criterion;
import java.util.List;
@@ -30,11 +30,11 @@ 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 JWTEncryptionConfigurationCriterion}.
+ * Criterion which holds one or more instances of {@link EncryptionConfigurationCriterion}.
*
* @since 2.2.0
*/
-public class JWTEncryptionConfigurationCriterion implements Criterion {
+public class EncryptionConfigurationCriterion implements Criterion {
/** The list of configuration instances. */
@Nonnull @NonnullElements private final List<EncryptionConfiguration> configs;
@@ -44,7 +44,7 @@ public class JWTEncryptionConfigurationCriterion implements Criterion {
*
* @param configurations list of configuration instances
*/
- public JWTEncryptionConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
+ public EncryptionConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
List<EncryptionConfiguration> configurations) {
configs = List.copyOf(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
@@ -56,7 +56,7 @@ public class JWTEncryptionConfigurationCriterion implements Criterion {
*
* @param configurations varargs array of configuration instances
*/
- public JWTEncryptionConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
+ public EncryptionConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
EncryptionConfiguration... configurations) {
configs = List.of(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
@@ -98,8 +98,8 @@ public class JWTEncryptionConfigurationCriterion implements Criterion {
return false;
}
- if (obj instanceof JWTEncryptionConfigurationCriterion) {
- return configs.equals(((JWTEncryptionConfigurationCriterion) obj).getConfigurations());
+ if (obj instanceof EncryptionConfigurationCriterion) {
+ return configs.equals(((EncryptionConfigurationCriterion) obj).getConfigurations());
}
return false;
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JOSEObjectCriterion.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/JOSEObjectCriterion.java
similarity index 98%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JOSEObjectCriterion.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/JOSEObjectCriterion.java
index aca214c..9f64f08 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JOSEObjectCriterion.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/JOSEObjectCriterion.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.criterion;
+package net.shibboleth.oidc.security.jose.criterion;
import javax.annotation.Nullable;
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWKSetCriterion.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/JWKSetCriterion.java
similarity index 98%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWKSetCriterion.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/JWKSetCriterion.java
index 1667a64..34f7417 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWKSetCriterion.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/JWKSetCriterion.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.criterion;
+package net.shibboleth.oidc.security.jose.criterion;
import javax.annotation.Nullable;
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/KeyIdCriterion.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/KeyIdCriterion.java
similarity index 98%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/KeyIdCriterion.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/KeyIdCriterion.java
index 3e2aff5..0cc177c 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/KeyIdCriterion.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/KeyIdCriterion.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.criterion;
+package net.shibboleth.oidc.security.jose.criterion;
import javax.annotation.Nonnull;
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/ProviderMetadataCriterion.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/ProviderMetadataCriterion.java
similarity index 97%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/ProviderMetadataCriterion.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/ProviderMetadataCriterion.java
index 38d3987..78ccbee 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/ProviderMetadataCriterion.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/ProviderMetadataCriterion.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.criterion;
+package net.shibboleth.oidc.security.jose.criterion;
import javax.annotation.Nonnull;
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/jose/criterion/SignatureSigningConfigurationCriterion.java
similarity index 84%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureSigningConfigurationCriterion.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/SignatureSigningConfigurationCriterion.java
index bdb2f61..697e318 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/jose/criterion/SignatureSigningConfigurationCriterion.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.criterion;
+package net.shibboleth.oidc.security.jose.criterion;
import java.util.List;
@@ -30,11 +30,11 @@ 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 JWTSignatureSigningConfigurationCriterion}.
+ * Criterion which holds one or more instances of {@link SignatureSigningConfigurationCriterion}.
*
* @since 2.2.0
*/
-public class JWTSignatureSigningConfigurationCriterion implements Criterion {
+public class SignatureSigningConfigurationCriterion implements Criterion {
/** The list of configuration instances. */
@Nonnull @NonnullElements private final List<SignatureSigningConfiguration> configs;
@@ -44,7 +44,7 @@ public class JWTSignatureSigningConfigurationCriterion implements Criterion {
*
* @param configurations list of configuration instances
*/
- public JWTSignatureSigningConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
+ public SignatureSigningConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
List<SignatureSigningConfiguration> configurations) {
configs = List.copyOf(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
@@ -56,7 +56,7 @@ public class JWTSignatureSigningConfigurationCriterion implements Criterion {
*
* @param configurations varargs array of configuration instances
*/
- public JWTSignatureSigningConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
+ public SignatureSigningConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
SignatureSigningConfiguration... configurations) {
configs = List.of(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
@@ -98,8 +98,8 @@ public class JWTSignatureSigningConfigurationCriterion implements Criterion {
return false;
}
- if (obj instanceof JWTSignatureSigningConfigurationCriterion) {
- return configs.equals(((JWTSignatureSigningConfigurationCriterion) obj).getConfigurations());
+ if (obj instanceof SignatureSigningConfigurationCriterion) {
+ return configs.equals(((SignatureSigningConfigurationCriterion) obj).getConfigurations());
}
return false;
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/jose/criterion/SignatureValidationConfigurationCriterion.java
similarity index 87%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/JWTSignatureValidationConfigurationCriterion.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/SignatureValidationConfigurationCriterion.java
index dce529f..dc1a580 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/jose/criterion/SignatureValidationConfigurationCriterion.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.criterion;
+package net.shibboleth.oidc.security.jose.criterion;
import java.util.List;
@@ -37,7 +37,7 @@ import net.shibboleth.utilities.java.support.resolver.Criterion;
*
* @since 2.2.0
*/
-public class JWTSignatureValidationConfigurationCriterion implements Criterion {
+public class SignatureValidationConfigurationCriterion implements Criterion {
/** The list of configuration instances. */
@Nonnull @NonnullElements private final List<SignatureValidationConfiguration> configs;
@@ -47,7 +47,7 @@ public class JWTSignatureValidationConfigurationCriterion implements Criterion {
*
* @param configurations list of configuration instances
*/
- public JWTSignatureValidationConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
+ public SignatureValidationConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
List<SignatureValidationConfiguration> configurations) {
configs = List.copyOf(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
@@ -59,7 +59,7 @@ public class JWTSignatureValidationConfigurationCriterion implements Criterion {
*
* @param configurations varargs array of configuration instances
*/
- public JWTSignatureValidationConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
+ public SignatureValidationConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty final
SignatureValidationConfiguration... configurations) {
configs = List.of(Constraint.isNotNull(configurations, "List of configurations cannot be null"));
Constraint.isNotEmpty(configs, "At least one configuration is required");
@@ -100,8 +100,8 @@ public class JWTSignatureValidationConfigurationCriterion implements Criterion {
if (obj == null) {
return false;
}
- if (obj instanceof JWTSignatureValidationConfigurationCriterion) {
- return configs.equals(((JWTSignatureValidationConfigurationCriterion) obj).getConfigurations());
+ if (obj instanceof SignatureValidationConfigurationCriterion) {
+ return configs.equals(((SignatureValidationConfigurationCriterion) obj).getConfigurations());
}
return false;
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/StaticCredentialCriterion.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/StaticCredentialCriterion.java
similarity index 97%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/StaticCredentialCriterion.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/StaticCredentialCriterion.java
index 9633f33..d83982c 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/StaticCredentialCriterion.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/StaticCredentialCriterion.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.criterion;
+package net.shibboleth.oidc.security.jose.criterion;
import javax.annotation.Nonnull;
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/package-info.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/package-info.java
similarity index 94%
rename from oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/package-info.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/package-info.java
index 1e37e57..b68d7c6 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/criterion/package-info.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/jose/criterion/package-info.java
@@ -16,4 +16,4 @@
*/
/** OIDC security criterion .*/
-package net.shibboleth.oidc.security.criterion;
\ No newline at end of file
+package net.shibboleth.oidc.security.jose.criterion;
\ No newline at end of file
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/BasicJOSEObjectCredentialResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/BasicJOSEObjectCredentialResolver.java
index 0c1d282..2426844 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/BasicJOSEObjectCredentialResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/BasicJOSEObjectCredentialResolver.java
@@ -43,9 +43,9 @@ import com.nimbusds.jose.jwk.RSAKey;
import net.shibboleth.oidc.security.credential.BasicJWKCredential;
import net.shibboleth.oidc.security.credential.JOSEObjectCredentialResolver;
-import net.shibboleth.oidc.security.criterion.JOSEObjectCriterion;
-import net.shibboleth.oidc.security.criterion.KeyIdCriterion;
import net.shibboleth.oidc.security.impl.CredentialConversionUtil;
+import net.shibboleth.oidc.security.jose.criterion.JOSEObjectCriterion;
+import net.shibboleth.oidc.security.jose.criterion.KeyIdCriterion;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ClientInformationCredentialResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ClientInformationCredentialResolver.java
index 6542fe6..cb1d8b8 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ClientInformationCredentialResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ClientInformationCredentialResolver.java
@@ -38,8 +38,8 @@ import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
import net.shibboleth.oidc.jwk.RemoteJwkSetCache;
import net.shibboleth.oidc.security.credential.BasicJWKCredential;
import net.shibboleth.oidc.security.credential.JOSEObjectCredentialResolver;
-import net.shibboleth.oidc.security.criterion.ClientInformationCriterion;
import net.shibboleth.oidc.security.impl.JWSAssemblyUtils;
+import net.shibboleth.oidc.security.jose.criterion.ClientInformationCriterion;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/CriterionCredentialResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/CriterionCredentialResolver.java
index 2255893..160513f 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/CriterionCredentialResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/CriterionCredentialResolver.java
@@ -27,8 +27,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.oidc.security.credential.JWKCredential;
-import net.shibboleth.oidc.security.criterion.StaticCredentialCriterion;
import net.shibboleth.oidc.security.impl.CredentialConversionUtil;
+import net.shibboleth.oidc.security.jose.criterion.StaticCredentialCriterion;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/EvaluableKeyIDCredentialCriterion.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/EvaluableKeyIDCredentialCriterion.java
index 9f4183d..4bc4b8c 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/EvaluableKeyIDCredentialCriterion.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/EvaluableKeyIDCredentialCriterion.java
@@ -26,7 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.oidc.security.credential.JWKCredential;
-import net.shibboleth.oidc.security.criterion.KeyIdCriterion;
+import net.shibboleth.oidc.security.jose.criterion.KeyIdCriterion;
import net.shibboleth.utilities.java.support.logic.AbstractTriStatePredicate;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolver.java
index 6c20c13..586a621 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolver.java
@@ -34,7 +34,7 @@ import com.nimbusds.jose.jwk.JWKSet;
import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
import net.shibboleth.oidc.jwk.RemoteJwkSetCache;
-import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ProviderMetadataCriterion;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseJWTSignatureSecurityHandler.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseJWTSignatureSecurityHandler.java
index 83d04d0..789f88b 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseJWTSignatureSecurityHandler.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseJWTSignatureSecurityHandler.java
@@ -41,10 +41,10 @@ import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
-import net.shibboleth.oidc.security.criterion.ClientInformationCriterion;
-import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
-import net.shibboleth.oidc.security.criterion.StaticCredentialCriterion;
import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
+import net.shibboleth.oidc.security.jose.criterion.ClientInformationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.criterion.StaticCredentialCriterion;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseSignedJWTTrustEngine.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseSignedJWTTrustEngine.java
index 5a62b64..f5dcc59 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseSignedJWTTrustEngine.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/BaseSignedJWTTrustEngine.java
@@ -43,7 +43,7 @@ import com.nimbusds.jwt.SignedJWT;
import net.shibboleth.oidc.security.credential.JOSEObjectCredentialResolver;
import net.shibboleth.oidc.security.credential.JWKCredential;
-import net.shibboleth.oidc.security.criterion.JOSEObjectCriterion;
+import net.shibboleth.oidc.security.jose.criterion.JOSEObjectCriterion;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/ExplicitKeySignedJWTTrustEngine.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/ExplicitKeySignedJWTTrustEngine.java
index 2e25a0a..407e198 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/ExplicitKeySignedJWTTrustEngine.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/ExplicitKeySignedJWTTrustEngine.java
@@ -36,7 +36,7 @@ import com.nimbusds.jwt.SignedJWT;
import net.shibboleth.oidc.security.credential.JOSEObjectCredentialResolver;
import net.shibboleth.oidc.security.credential.impl.EvaluableKeyIDCredentialCriterion;
-import net.shibboleth.oidc.security.criterion.KeyIdCriterion;
+import net.shibboleth.oidc.security.jose.criterion.KeyIdCriterion;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/OIDCTokenDecrypter.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/OIDCTokenDecrypter.java
index c5a66d9..731344a 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/OIDCTokenDecrypter.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/impl/OIDCTokenDecrypter.java
@@ -67,9 +67,9 @@ import com.nimbusds.jwt.JWTParser;
import net.shibboleth.oidc.security.credential.JWKCredential;
import net.shibboleth.oidc.security.credential.impl.EvaluableKeyIDCredentialCriterion;
-import net.shibboleth.oidc.security.criterion.JOSEObjectCriterion;
-import net.shibboleth.oidc.security.criterion.KeyIdCriterion;
import net.shibboleth.oidc.security.jose.DecryptionParameters;
+import net.shibboleth.oidc.security.jose.criterion.JOSEObjectCriterion;
+import net.shibboleth.oidc.security.jose.criterion.KeyIdCriterion;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicSignatureSigningParametersResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicSignatureSigningParametersResolver.java
index 932cf2d..4886530 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicSignatureSigningParametersResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicSignatureSigningParametersResolver.java
@@ -35,10 +35,10 @@ import org.opensaml.xmlsec.impl.AlgorithmRuntimeSupportedPredicate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.oidc.security.criterion.JWTSignatureSigningConfigurationCriterion;
import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
import net.shibboleth.oidc.security.jose.SignatureSigningParametersResolver;
+import net.shibboleth.oidc.security.jose.criterion.SignatureSigningConfigurationCriterion;
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;
@@ -53,7 +53,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
* The following {@link net.shibboleth.utilities.java.support.resolver.Criterion} inputs are supported:
* </p>
* <ul>
- * <li>{@link JWTSignatureSigningConfigurationCriterion} - required</li>
+ * <li>{@link SignatureSigningConfigurationCriterion} - required</li>
* </ul>
*/
public class BasicSignatureSigningParametersResolver
@@ -110,7 +110,7 @@ public class BasicSignatureSigningParametersResolver
@Nullable
public SignatureSigningParameters resolveSingle(@Nonnull final CriteriaSet criteria) throws ResolverException {
Constraint.isNotNull(criteria, "CriteriaSet was null");
- Constraint.isNotNull(criteria.get(JWTSignatureSigningConfigurationCriterion.class),
+ Constraint.isNotNull(criteria.get(SignatureSigningConfigurationCriterion.class),
"Resolver requires an instance of SignatureSigningConfigurationCriterion");
final Predicate<String> includeExcludePredicate = getIncludeExcludePredicate(criteria);
@@ -175,7 +175,7 @@ public class BasicSignatureSigningParametersResolver
*/
@Nonnull protected Predicate<String> getIncludeExcludePredicate(@Nonnull final CriteriaSet criteria) {
return resolveIncludeExcludePredicate(criteria,
- criteria.get(JWTSignatureSigningConfigurationCriterion.class).getConfigurations());
+ criteria.get(SignatureSigningConfigurationCriterion.class).getConfigurations());
}
/**
@@ -247,7 +247,7 @@ public class BasicSignatureSigningParametersResolver
@Nonnull protected List<Credential> getEffectiveSigningCredentials(@Nonnull final CriteriaSet criteria) {
final ArrayList<Credential> accumulator = new ArrayList<>();
for (final SignatureSigningConfiguration config :
- criteria.get(JWTSignatureSigningConfigurationCriterion.class).getConfigurations()) {
+ criteria.get(SignatureSigningConfigurationCriterion.class).getConfigurations()) {
accumulator.addAll(config.getSigningCredentials());
@@ -267,7 +267,7 @@ public class BasicSignatureSigningParametersResolver
@Nonnull final Predicate<String> includeExcludePredicate) {
final ArrayList<String> accumulator = new ArrayList<>();
for (final SignatureSigningConfiguration config :
- criteria.get(JWTSignatureSigningConfigurationCriterion.class).getConfigurations()) {
+ criteria.get(SignatureSigningConfigurationCriterion.class).getConfigurations()) {
config.getSignatureAlgorithms()
.stream()
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicSignatureValidationParametersResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicSignatureValidationParametersResolver.java
index b779873..b610a90 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicSignatureValidationParametersResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/BasicSignatureValidationParametersResolver.java
@@ -30,10 +30,10 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.jwt.SignedJWT;
-import net.shibboleth.oidc.security.criterion.JWTSignatureValidationConfigurationCriterion;
import net.shibboleth.oidc.security.jose.SignatureValidationConfiguration;
import net.shibboleth.oidc.security.jose.SignatureValidationParameters;
import net.shibboleth.oidc.security.jose.SignatureValidationParametersResolver;
+import net.shibboleth.oidc.security.jose.criterion.SignatureValidationConfigurationCriterion;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -46,7 +46,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
* The following {@link net.shibboleth.utilities.java.support.resolver.Criterion} inputs are supported:
* </p>
* <ul>
- * <li>{@link JWTSignatureValidationConfigurationCriterion} - required</li>
+ * <li>{@link SignatureValidationConfigurationCriterion} - required</li>
* </ul>
*/
public class BasicSignatureValidationParametersResolver
@@ -77,13 +77,13 @@ public class BasicSignatureValidationParametersResolver
public SignatureValidationParameters resolveSingle(
@Nonnull final CriteriaSet criteria) throws ResolverException {
Constraint.isNotNull(criteria, "CriteriaSet was null");
- Constraint.isNotNull(criteria.get(JWTSignatureValidationConfigurationCriterion.class),
+ Constraint.isNotNull(criteria.get(SignatureValidationConfigurationCriterion.class),
"Resolver requires an instance of SignatureValidationConfigurationCriterion");
final SignatureValidationParameters params = new SignatureValidationParameters();
resolveAndPopulateIncludesExcludes(params, criteria,
- criteria.get(JWTSignatureValidationConfigurationCriterion.class).getConfigurations());
+ criteria.get(SignatureValidationConfigurationCriterion.class).getConfigurations());
params.setSignatureTrustEngine(resolveSignatureTrustEngine(criteria));
@@ -119,7 +119,7 @@ public class BasicSignatureValidationParametersResolver
protected TrustEngine<SignedJWT> resolveSignatureTrustEngine(@Nonnull final CriteriaSet criteria) {
for (final SignatureValidationConfiguration config : criteria
- .get(JWTSignatureValidationConfigurationCriterion.class).getConfigurations()) {
+ .get(SignatureValidationConfigurationCriterion.class).getConfigurations()) {
if (config.getSignatureTrustEngine() != null) {
return config.getSignatureTrustEngine();
}
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ClientInformationDataEncryptionAlgorithmsLookupStrategy.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ClientInformationDataEncryptionAlgorithmsLookupStrategy.java
index 65ff96b..456d4b4 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ClientInformationDataEncryptionAlgorithmsLookupStrategy.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ClientInformationDataEncryptionAlgorithmsLookupStrategy.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
-import net.shibboleth.oidc.security.criterion.ClientInformationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ClientInformationCriterion;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ClientInformationKeyTransportEncryptionAlgorithmsLookupStrategy.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ClientInformationKeyTransportEncryptionAlgorithmsLookupStrategy.java
index 024f017..ce024ea 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ClientInformationKeyTransportEncryptionAlgorithmsLookupStrategy.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ClientInformationKeyTransportEncryptionAlgorithmsLookupStrategy.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
-import net.shibboleth.oidc.security.criterion.ClientInformationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ClientInformationCriterion;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultDataEncryptionAlgorithmsLookupStrategy.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultDataEncryptionAlgorithmsLookupStrategy.java
index 0516a8e..4eaf5d0 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultDataEncryptionAlgorithmsLookupStrategy.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultDataEncryptionAlgorithmsLookupStrategy.java
@@ -26,9 +26,9 @@ import javax.annotation.Nullable;
import org.opensaml.xmlsec.algorithm.AlgorithmRegistry;
-import net.shibboleth.oidc.security.criterion.JWTEncryptionConfigurationCriterion;
import net.shibboleth.oidc.security.impl.AbstractEncryptionAlgorithmsLookupStrategy;
import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
+import net.shibboleth.oidc.security.jose.criterion.EncryptionConfigurationCriterion;
import net.shibboleth.utilities.java.support.logic.PredicateSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -66,7 +66,7 @@ public class DefaultDataEncryptionAlgorithmsLookupStrategy extends AbstractEncry
final Predicate<String> includeExcludePredicate){
final ArrayList<String> accumulator = new ArrayList<>();
for (final EncryptionConfiguration config
- : criteria.get(JWTEncryptionConfigurationCriterion.class).getConfigurations()) {
+ : criteria.get(EncryptionConfigurationCriterion.class).getConfigurations()) {
config.getDataEncryptionAlgorithms()
.stream()
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultDecryptionParametersResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultDecryptionParametersResolver.java
index 6dbc734..2e2f2e8 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultDecryptionParametersResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultDecryptionParametersResolver.java
@@ -28,10 +28,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.oidc.security.credential.JOSEObjectCredentialResolver;
-import net.shibboleth.oidc.security.criterion.JWTDecryptionConfigurationCriterion;
import net.shibboleth.oidc.security.jose.DecryptionConfiguration;
import net.shibboleth.oidc.security.jose.DecryptionParameters;
import net.shibboleth.oidc.security.jose.DecryptionParametersResolver;
+import net.shibboleth.oidc.security.jose.criterion.DecryptionConfigurationCriterion;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -43,7 +43,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
* The following {@link net.shibboleth.utilities.java.support.resolver.Criterion} inputs are supported:
* </p>
* <ul>
- * <li>{@link JWTDecryptionConfigurationCriterion} - required</li>
+ * <li>{@link DecryptionConfigurationCriterion} - required</li>
* </ul>
*
* @since 2.2.0
@@ -66,13 +66,13 @@ public class DefaultDecryptionParametersResolver extends AbstractSecurityParamet
@Override
public DecryptionParameters resolveSingle(final CriteriaSet criteria) throws ResolverException {
Constraint.isNotNull(criteria, "CriteriaSet was null");
- Constraint.isNotNull(criteria.get(JWTDecryptionConfigurationCriterion.class),
+ Constraint.isNotNull(criteria.get(DecryptionConfigurationCriterion.class),
"Resolver requires an instance of DecryptionConfigurationCriterion");
final DecryptionParameters params = new DecryptionParameters();
resolveAndPopulateIncludesExcludes(params, criteria,
- criteria.get(JWTDecryptionConfigurationCriterion.class).getConfigurations());
+ criteria.get(DecryptionConfigurationCriterion.class).getConfigurations());
params.setContentEncryptionKeyCredentialResolver(resolveContentEncryptionKeyCredentialResolver(criteria));
params.setKEKCredentialResolver(resolveKEKCredentialResolver(criteria));
@@ -98,7 +98,7 @@ public class DefaultDecryptionParametersResolver extends AbstractSecurityParamet
@Nullable protected JOSEObjectCredentialResolver resolveKEKCredentialResolver(
@Nonnull final CriteriaSet criteria) {
- for (final DecryptionConfiguration config : criteria.get(JWTDecryptionConfigurationCriterion.class)
+ for (final DecryptionConfiguration config : criteria.get(DecryptionConfigurationCriterion.class)
.getConfigurations()) {
if (config.getKEKCredentialResolver() != null) {
return config.getKEKCredentialResolver();
@@ -117,7 +117,7 @@ public class DefaultDecryptionParametersResolver extends AbstractSecurityParamet
@Nullable protected JOSEObjectCredentialResolver resolveContentEncryptionKeyCredentialResolver(
@Nonnull final CriteriaSet criteria) {
- for (final DecryptionConfiguration config : criteria.get(JWTDecryptionConfigurationCriterion.class)
+ for (final DecryptionConfiguration config : criteria.get(DecryptionConfigurationCriterion.class)
.getConfigurations()) {
if (config.getContentEncryptionKeyCredentialResolver() != null) {
return config.getContentEncryptionKeyCredentialResolver();
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultEncryptionParametersResolver.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultEncryptionParametersResolver.java
index 7006727..b5e6b4f 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultEncryptionParametersResolver.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultEncryptionParametersResolver.java
@@ -49,13 +49,13 @@ import com.nimbusds.jose.JOSEException;
import com.nimbusds.jose.JWEAlgorithm;
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.impl.CredentialConversionUtil;
import net.shibboleth.oidc.security.impl.JWKCredentialSupport;
import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
import net.shibboleth.oidc.security.jose.EncryptionParameters;
import net.shibboleth.oidc.security.jose.EncryptionParametersResolver;
+import net.shibboleth.oidc.security.jose.criterion.EncryptionConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ProviderMetadataCriterion;
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;
@@ -67,7 +67,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
*
* <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 EncryptionConfiguration}
- * inside the input {@link CriteriaSet}. Therefore, the {@link JWTEncryptionConfigurationCriterion} must be present
+ * inside the input {@link CriteriaSet}. Therefore, the {@link EncryptionConfigurationCriterion} must be present
* inside the criteria set, and the resolvers must be configured for any parameters to be returned.</p>
*
* <p>Once the set of algorithms and credentials have been looked up and resolved. The key transport algorithms are
@@ -87,7 +87,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
* The following {@link net.shibboleth.utilities.java.support.resolver.Criterion} inputs are supported:
* </p>
* <ul>
- * <li>{@link JWTEncryptionConfigurationCriterion} - required</li>
+ * <li>{@link EncryptionConfigurationCriterion} - required</li>
* <li>{@link ProviderMetadataCriterion} - likely required for some downstream resolvers</li>
* </ul>
*/
@@ -187,7 +187,7 @@ public class DefaultEncryptionParametersResolver extends AbstractSecurityParamet
@Nullable public EncryptionParameters resolveSingle(@Nonnull final CriteriaSet criteria)
throws ResolverException {
Constraint.isNotNull(criteria, "CriteriaSet was null");
- Constraint.isNotNull(criteria.get(JWTEncryptionConfigurationCriterion.class),
+ Constraint.isNotNull(criteria.get(EncryptionConfigurationCriterion.class),
"Resolver requires an instance of JWTEncryptionConfigurationCriterion");
final Predicate<String> includeExcludePredicate = getIncludeExcludePredicate(criteria);
@@ -219,7 +219,7 @@ public class DefaultEncryptionParametersResolver extends AbstractSecurityParamet
@Nullable protected CredentialResolver resolveKEKCredentialResolver(
@Nonnull final CriteriaSet criteria) {
- for (final EncryptionConfiguration config : criteria.get(JWTEncryptionConfigurationCriterion.class)
+ for (final EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
.getConfigurations()) {
if (config.getKEKCredentialResolver() != null) {
return config.getKEKCredentialResolver();
@@ -237,7 +237,7 @@ public class DefaultEncryptionParametersResolver extends AbstractSecurityParamet
@Nullable protected CredentialResolver resolveContentEncryptionKeyCredentialResolver(
@Nonnull final CriteriaSet criteria) {
- for (final EncryptionConfiguration config : criteria.get(JWTEncryptionConfigurationCriterion.class)
+ for (final EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
.getConfigurations()) {
if (config.getContentEncryptionKeyCredentialResolver() != null) {
return config.getContentEncryptionKeyCredentialResolver();
@@ -342,7 +342,7 @@ public class DefaultEncryptionParametersResolver extends AbstractSecurityParamet
*/
@Nonnull protected Predicate<String> getIncludeExcludePredicate(@Nonnull final CriteriaSet criteria) {
return resolveIncludeExcludePredicate(criteria,
- criteria.get(JWTEncryptionConfigurationCriterion.class).getConfigurations());
+ criteria.get(EncryptionConfigurationCriterion.class).getConfigurations());
}
/**
@@ -356,7 +356,7 @@ public class DefaultEncryptionParametersResolver extends AbstractSecurityParamet
protected void resolveAndPopulateCredentialsAndAlgorithms(@Nonnull final EncryptionParameters params,
@Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> includeExcludePredicate) {
- if (!criteria.contains(JWTEncryptionConfigurationCriterion.class)) {
+ if (!criteria.contains(EncryptionConfigurationCriterion.class)) {
log.debug("No encryption configuration criterion, encryption parameters can not be resolved");
return;
}
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategy.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategy.java
index 6ba1345..7746cf0 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategy.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategy.java
@@ -27,9 +27,9 @@ import javax.annotation.Nullable;
import org.opensaml.xmlsec.algorithm.AlgorithmRegistry;
-import net.shibboleth.oidc.security.criterion.JWTEncryptionConfigurationCriterion;
import net.shibboleth.oidc.security.impl.AbstractEncryptionAlgorithmsLookupStrategy;
import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
+import net.shibboleth.oidc.security.jose.criterion.EncryptionConfigurationCriterion;
import net.shibboleth.utilities.java.support.logic.PredicateSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -67,12 +67,12 @@ public class DefaultKeyTransportEncryptionAlgorithmsLookupStrategy extends Abstr
*/
@Nonnull protected List<String> getKeyTransportAlgorithmsFromConfiguration(final CriteriaSet criteria,
final Predicate<String> includeExcludePredicate){
- if (!criteria.contains(JWTEncryptionConfigurationCriterion.class)) {
+ if (!criteria.contains(EncryptionConfigurationCriterion.class)) {
return Collections.emptyList();
}
final ArrayList<String> accumulator = new ArrayList<>();
for (final EncryptionConfiguration config
- : criteria.get(JWTEncryptionConfigurationCriterion.class).getConfigurations()) {
+ : criteria.get(EncryptionConfigurationCriterion.class).getConfigurations()) {
config.getKeyTransportEncryptionAlgorithms()
.stream()
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategy.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategy.java
index 635e5c9..f31e6a8 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategy.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ProviderMetadataDataEncryptionAlgorithmsLookupStrategy.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
-import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ProviderMetadataCriterion;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategy.java b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategy.java
index f459b6d..f51edae 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategy.java
+++ b/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/jose/impl/ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategy.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
-import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ProviderMetadataCriterion;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/BaseMetadataCredentialResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/BaseMetadataCredentialResolverTest.java
index 697f921..99dd799 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/BaseMetadataCredentialResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/BaseMetadataCredentialResolverTest.java
@@ -53,7 +53,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import net.shibboleth.oidc.jwk.RemoteJwkSetCache;
-import net.shibboleth.oidc.security.criterion.KeyIdCriterion;
+import net.shibboleth.oidc.security.jose.criterion.KeyIdCriterion;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.InitializableComponent;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientInformationCredentialResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientInformationCredentialResolverTest.java
index 9f9eb08..79d94ad 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientInformationCredentialResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ClientInformationCredentialResolverTest.java
@@ -36,8 +36,8 @@ import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
import net.shibboleth.oidc.jwk.RemoteJwkSetCache;
-import net.shibboleth.oidc.security.criterion.ClientInformationCriterion;
-import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ClientInformationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ProviderMetadataCriterion;
import net.shibboleth.utilities.java.support.component.InitializableComponent;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolverTest.java
index 39fd646..5b81f9b 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/LocalJOSEObjectCredentialResolverTest.java
@@ -38,7 +38,7 @@ import com.nimbusds.jwt.SignedJWT;
import net.shibboleth.oidc.security.credential.BasicJWKCredential;
import net.shibboleth.oidc.security.credential.JOSEObjectCredentialResolver;
-import net.shibboleth.oidc.security.criterion.JOSEObjectCriterion;
+import net.shibboleth.oidc.security.jose.criterion.JOSEObjectCriterion;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolverTest.java
index f182ca8..86a8dfd 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/credential/impl/ProviderMetadataCredentialResolverTest.java
@@ -26,8 +26,8 @@ import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
import net.shibboleth.oidc.jwk.RemoteJwkSetCache;
-import net.shibboleth.oidc.security.criterion.ClientInformationCriterion;
-import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ClientInformationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ProviderMetadataCriterion;
import net.shibboleth.utilities.java.support.component.InitializableComponent;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
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 8519bc0..8b98964 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
@@ -47,8 +47,8 @@ import net.shibboleth.oidc.jwa.algorithm.descriptors.EncryptionA128GCM;
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.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.criterion.EncryptionConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ProviderMetadataCriterion;
import net.shibboleth.oidc.security.jose.impl.BasicEncryptionConfiguration;
import net.shibboleth.oidc.security.jose.impl.ProviderMetadataDataEncryptionAlgorithmsLookupStrategy;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -101,7 +101,7 @@ public class ProviderMetadataDataEncryptionAlgorithmsLookupStrategyTest {
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));
- criteria = new CriteriaSet(new JWTEncryptionConfigurationCriterion(List.of(config)));
+ criteria = new CriteriaSet(new EncryptionConfigurationCriterion(List.of(config)));
final OIDCProviderMetadata metadata = OIDCProviderMetadata.parse(readJsonFromFile(GOOD_PROVIDER_CONFIGURATION_INFO));
criteria.add(
new ProviderMetadataCriterion(metadata));
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 7440457..359cc3a 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
@@ -47,8 +47,8 @@ import net.shibboleth.oidc.jwa.algorithm.descriptors.KeyTransportRSAOAEP;
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.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.criterion.EncryptionConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ProviderMetadataCriterion;
import net.shibboleth.oidc.security.jose.impl.BasicEncryptionConfiguration;
import net.shibboleth.oidc.security.jose.impl.ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategy;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -101,7 +101,7 @@ public class ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategyTest
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));
- criteria = new CriteriaSet(new JWTEncryptionConfigurationCriterion(List.of(config)));
+ criteria = new CriteriaSet(new EncryptionConfigurationCriterion(List.of(config)));
final OIDCProviderMetadata metadata = OIDCProviderMetadata.parse(readJsonFromFile(GOOD_PROVIDER_CONFIGURATION_INFO));
criteria.add(new ProviderMetadataCriterion(metadata));
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultDataEncryptionAlgorithmsLookupStrategyTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultDataEncryptionAlgorithmsLookupStrategyTest.java
index 01ec0e2..b481b48 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultDataEncryptionAlgorithmsLookupStrategyTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultDataEncryptionAlgorithmsLookupStrategyTest.java
@@ -33,7 +33,7 @@ import net.shibboleth.oidc.jwa.algorithm.descriptors.EncryptionA128GCM;
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.criterion.EncryptionConfigurationCriterion;
import net.shibboleth.oidc.security.jose.impl.BasicEncryptionConfiguration;
import net.shibboleth.oidc.security.jose.impl.DefaultDataEncryptionAlgorithmsLookupStrategy;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -62,7 +62,7 @@ public class DefaultDataEncryptionAlgorithmsLookupStrategyTest {
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));
- criteria = new CriteriaSet(new JWTEncryptionConfigurationCriterion(List.of(config)));
+ criteria = new CriteriaSet(new EncryptionConfigurationCriterion(List.of(config)));
strategy = new DefaultDataEncryptionAlgorithmsLookupStrategy(algorithmRegistry);
}
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultEncryptionParametersResolverTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultEncryptionParametersResolverTest.java
index d420718..d5b0c65 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultEncryptionParametersResolverTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultEncryptionParametersResolverTest.java
@@ -50,10 +50,10 @@ import net.shibboleth.oidc.jwa.support.KeyManagementConstants;
import net.shibboleth.oidc.security.credential.BasicJWKCredential;
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.impl.TestCredentialHelper;
import net.shibboleth.oidc.security.jose.EncryptionParameters;
+import net.shibboleth.oidc.security.jose.criterion.EncryptionConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.StaticCredentialCriterion;
import net.shibboleth.oidc.security.jose.impl.BasicEncryptionConfiguration;
import net.shibboleth.oidc.security.jose.impl.DefaultEncryptionParametersResolver;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -130,7 +130,7 @@ public class DefaultEncryptionParametersResolverTest {
config.setDataEncryptionAlgorithms(
List.of(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256,EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM,
EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512));
- final CriteriaSet criteria = new CriteriaSet(new JWTEncryptionConfigurationCriterion(List.of(config)));
+ final CriteriaSet criteria = new CriteriaSet(new EncryptionConfigurationCriterion(List.of(config)));
criteria.add(new UsageCriterion(UsageType.ENCRYPTION));
return criteria;
}
diff --git a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategyTest.java b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategyTest.java
index 4dd05f9..8418639 100644
--- a/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategyTest.java
+++ b/oidc-common-crypto-impl/src/test/java/net/shibboleth/oidc/security/jose/impl/DefaultKeyTransportEncryptionAlgorithmsLookupStrategyTest.java
@@ -33,7 +33,7 @@ import net.shibboleth.oidc.jwa.algorithm.descriptors.KeyTransportRSAOAEP;
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.criterion.EncryptionConfigurationCriterion;
import net.shibboleth.oidc.security.jose.impl.BasicEncryptionConfiguration;
import net.shibboleth.oidc.security.jose.impl.DefaultKeyTransportEncryptionAlgorithmsLookupStrategy;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -62,7 +62,7 @@ public class DefaultKeyTransportEncryptionAlgorithmsLookupStrategyTest {
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));
- criteria = new CriteriaSet(new JWTEncryptionConfigurationCriterion(List.of(config)));
+ criteria = new CriteriaSet(new EncryptionConfigurationCriterion(List.of(config)));
strategy = new DefaultKeyTransportEncryptionAlgorithmsLookupStrategy(algorithmRegistry);
}
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 81e103f..3566cc7 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
@@ -34,13 +34,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.criterion.JWTDecryptionConfigurationCriterion;
-import net.shibboleth.oidc.security.criterion.StaticCredentialCriterion;
import net.shibboleth.oidc.security.jose.DecryptionConfiguration;
import net.shibboleth.oidc.security.jose.DecryptionParameters;
import net.shibboleth.oidc.security.jose.DecryptionParametersResolver;
import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
+import net.shibboleth.oidc.security.jose.criterion.DecryptionConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.StaticCredentialCriterion;
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;
@@ -200,7 +200,7 @@ public class PopulateJWTDecryptionParameters extends AbstractProfileAction {
final List<DecryptionConfiguration> configs) {
final CriteriaSet criteria = new CriteriaSet();
- criteria.add(new JWTDecryptionConfigurationCriterion(configs));
+ criteria.add(new DecryptionConfigurationCriterion(configs));
// Build a static credential criteria. Extract the decryption credential from the RP config.
final RelyingPartyContext rpCtx = relyingPartyContextLookupStrategy.apply(profileRequestContext);
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 075f4fc..fce324d 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,14 +42,14 @@ 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.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.oidc.security.jose.EncryptionParameters;
import net.shibboleth.oidc.security.jose.EncryptionParametersResolver;
import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
+import net.shibboleth.oidc.security.jose.criterion.ClientInformationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.EncryptionConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.criterion.StaticCredentialCriterion;
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;
@@ -304,7 +304,7 @@ public class PopulateJWTEncryptionParameters extends AbstractProfileAction {
private CriteriaSet buildCriteriaSet(@Nonnull final ProfileRequestContext profileRequestContext) {
final CriteriaSet criteria = new CriteriaSet(
- new JWTEncryptionConfigurationCriterion(encryptionConfigurations));
+ new EncryptionConfigurationCriterion(encryptionConfigurations));
criteria.add(new UsageCriterion(UsageType.ENCRYPTION));
criteria.add(new EncryptionOptionalCriterion(encryptionOptional));
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 342106a..bb2a07c 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,14 +40,14 @@ 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.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.oidc.security.jose.SignatureSigningParameters;
import net.shibboleth.oidc.security.jose.SignatureSigningParametersResolver;
import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
+import net.shibboleth.oidc.security.jose.criterion.ClientInformationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.criterion.SignatureSigningConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.StaticCredentialCriterion;
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;
@@ -282,7 +282,7 @@ public class PopulateJWTSignatureSigningParametersHandler extends AbstractMessag
throw new MessageHandlerException("No SignatureSigningConfiguration returned by lookup strategy");
}
- final CriteriaSet criteria = new CriteriaSet(new JWTSignatureSigningConfigurationCriterion(configs));
+ final CriteriaSet criteria = new CriteriaSet(new SignatureSigningConfigurationCriterion(configs));
final SAMLMetadataContext metadataCtx = metadataContextLookupStrategy.apply(messageContext);
if (metadataCtx != null && metadataCtx.getRoleDescriptor() != null) {
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 563f1cf..5c86180 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.criterion.JWTSignatureValidationConfigurationCriterion;
import net.shibboleth.oidc.security.jose.SignatureValidationConfiguration;
import net.shibboleth.oidc.security.jose.SignatureValidationParameters;
import net.shibboleth.oidc.security.jose.SignatureValidationParametersResolver;
import net.shibboleth.oidc.security.jose.context.SecurityParametersContext;
+import net.shibboleth.oidc.security.jose.criterion.SignatureValidationConfigurationCriterion;
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;
@@ -143,7 +143,7 @@ public class PopulateJWTSignatureValidationParametersHandler extends AbstractMes
try {
final SignatureValidationParameters params = resolver.resolveSingle(
- new CriteriaSet(new JWTSignatureValidationConfigurationCriterion(configs)));
+ new CriteriaSet(new SignatureValidationConfigurationCriterion(configs)));
paramsCtx.setSignatureValidationParameters(params);
log.debug("{} {} SignatureValidationParameters", getLogPrefix(),
params != null ? "Resolved" : "Failed to resolve");
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list