[java-idp-plugin-oidc-rp] branch main updated: JCOMOIDC-60 - JWT class naming convention
Phil Smart
philip.smart at jisc.ac.uk
Wed Jan 11 10:42:34 UTC 2023
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-idp-plugin-oidc-rp.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-oidc-rp.git;a=commit;h=cbc4a8fc3b9e526e26c5f9b34447577e71357bf4
The following commit(s) were added to refs/heads/main by this push:
new cbc4a8f JCOMOIDC-60 - JWT class naming convention
cbc4a8f is described below
commit cbc4a8fc3b9e526e26c5f9b34447577e71357bf4
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Jan 11 10:42:32 2023 +0000
JCOMOIDC-60 - JWT class naming convention
- Update RP to work with latest commons name changes
https://shibboleth.atlassian.net/browse/JCOMOIDC-60
---
.../idp/service/relying-party/postconfig.xml | 8 ++++----
.../plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java | 22 +++++++++++-----------
...ingPartyProxySigningParametersResolverTest.java | 12 ++++++------
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index c788373..cfb5b05 100644
--- a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -15,22 +15,22 @@
signatures and loads the default credentials used.
-->
<bean id="shibboleth.authn.oidc.rp.BasicSignatureValidationConfiguration" abstract="true"
- class="net.shibboleth.oidc.security.impl.BasicJWTSignatureValidationConfiguration"
+ class="net.shibboleth.oidc.security.jose.impl.BasicSignatureValidationConfiguration"
p:includedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.IncludedSignatureAlgorithms')}"
p:excludedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.ExcludedSignatureAlgorithms')}" />
<bean id="shibboleth.authn.oidc.rp.BasicSignatureSigningConfiguration" abstract="true"
- class="net.shibboleth.oidc.security.impl.BasicJWTSignatureSigningConfiguration"
+ class="net.shibboleth.oidc.security.jose.impl.BasicSignatureSigningConfiguration"
p:includedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.IncludedSignatureAlgorithms')}"
p:excludedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.ExcludedSignatureAlgorithms')}" />
<bean id="shibboleth.authn.oidc.rp.BasicEncryptionConfiguration" abstract="true"
- class="net.shibboleth.oidc.security.impl.BasicJWTEncryptionConfiguration"
+ class="net.shibboleth.oidc.security.jose.impl.BasicEncryptionConfiguration"
p:includedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.IncludedEncryptionAlgorithms')}"
p:excludedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.ExcludedEncryptionAlgorithms')}" />
<bean id="shibboleth.authn.oidc.rp.BasicDecryptionConfiguration" abstract="true"
- class="net.shibboleth.oidc.security.impl.BasicJWTDecryptionConfiguration"
+ class="net.shibboleth.oidc.security.jose.impl.BasicDecryptionConfiguration"
p:includedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.IncludedEncryptionAlgorithms')}"
p:excludedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.ExcludedEncryptionAlgorithms')}" />
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
index c990994..bd6f1d9 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
@@ -90,9 +90,9 @@ import net.shibboleth.oidc.security.credential.JOSEObjectCredentialResolver;
import net.shibboleth.oidc.security.credential.impl.BasicJOSEObjectCredentialResolver;
import net.shibboleth.oidc.security.credential.impl.ChainingJOSEObjectCredentialResolver;
import net.shibboleth.oidc.security.credential.impl.CriterionCredentialResolver;
-import net.shibboleth.oidc.security.impl.BasicJWTDecryptionConfiguration;
-import net.shibboleth.oidc.security.impl.BasicJWTSignatureValidationConfiguration;
import net.shibboleth.oidc.security.impl.ExplicitKeySignedJWTTrustEngine;
+import net.shibboleth.oidc.security.jose.impl.BasicDecryptionConfiguration;
+import net.shibboleth.oidc.security.jose.impl.BasicSignatureValidationConfiguration;
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.Unmodifiable;
@@ -416,14 +416,14 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
final var securityConfig = new JSONSecurityConfiguration();
- final var sigValConfig = new BasicJWTSignatureValidationConfiguration();
+ final var sigValConfig = new BasicSignatureValidationConfiguration();
sigValConfig.setSignatureTrustEngine(
new ExplicitKeySignedJWTTrustEngine(new CriterionCredentialResolver(),
new BasicJOSEObjectCredentialResolver()));
securityConfig.setJwtSignatureValidationConfiguration(sigValConfig);
//The CEK resolver just resolves keys from the criteria set.
- final var tokenDecryptConfig = new BasicJWTDecryptionConfiguration();
+ final var tokenDecryptConfig = new BasicDecryptionConfiguration();
tokenDecryptConfig.setContentEncryptionKeyCredentialResolver(new CriterionCredentialResolver());
securityConfig.setJwtDecryptionConfiguration(tokenDecryptConfig);
@@ -877,10 +877,10 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
// Set a default security config for the profile config
final JSONSecurityConfiguration secConfig = new JSONSecurityConfiguration();
- final var idTokenDecryptConfig = new BasicJWTDecryptionConfiguration();
+ final var idTokenDecryptConfig = new BasicDecryptionConfiguration();
idTokenDecryptConfig.setContentEncryptionKeyCredentialResolver(new CriterionCredentialResolver());
- final var decryptConfig = new BasicJWTDecryptionConfiguration();
+ final var decryptConfig = new BasicDecryptionConfiguration();
decryptConfig.setContentEncryptionKeyCredentialResolver(new CriterionCredentialResolver());
decryptConfig.setKEKCredentialResolver(new JOSEObjectCredentialResolver() {
@@ -905,8 +905,8 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
secConfig.setJwtDecryptionConfiguration(decryptConfig);
//Signature config for userinfo token
- final BasicJWTSignatureValidationConfiguration sigValidation =
- new BasicJWTSignatureValidationConfiguration();
+ final BasicSignatureValidationConfiguration sigValidation =
+ new BasicSignatureValidationConfiguration();
sigValidation.setSignatureTrustEngine(
new ExplicitKeySignedJWTTrustEngine(
new ChainingJOSEObjectCredentialResolver(List.of(new CriterionCredentialResolver(),
@@ -996,14 +996,14 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
final JSONSecurityConfiguration secConfig = new JSONSecurityConfiguration();
- final BasicJWTSignatureValidationConfiguration sigValidation =
- new BasicJWTSignatureValidationConfiguration();
+ final BasicSignatureValidationConfiguration sigValidation =
+ new BasicSignatureValidationConfiguration();
sigValidation.setSignatureTrustEngine(new ExplicitKeySignedJWTTrustEngine(
new CriterionCredentialResolver(), new BasicJOSEObjectCredentialResolver()));
secConfig.setJwtSignatureValidationConfiguration(sigValidation);
- final var decryptConfig = new BasicJWTDecryptionConfiguration();
+ final var decryptConfig = new BasicDecryptionConfiguration();
decryptConfig.setKEKCredentialResolver(new JOSEObjectCredentialResolver() {
@Override
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolverTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolverTest.java
index 995df61..c183892 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolverTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolverTest.java
@@ -60,8 +60,8 @@ import net.shibboleth.oidc.security.credential.JWKCredential;
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.impl.BasicJWTSignatureSigningConfiguration;
import net.shibboleth.oidc.security.impl.JWSAssemblyUtils;
+import net.shibboleth.oidc.security.jose.impl.BasicSignatureSigningConfiguration;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -177,8 +177,8 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
criteria.add(new StaticCredentialCriterion(createClientSecretCredential("atestsecret")));
// Add an RSA type to the security config
- final BasicJWTSignatureSigningConfiguration config =
- (BasicJWTSignatureSigningConfiguration)
+ final BasicSignatureSigningConfiguration config =
+ (BasicSignatureSigningConfiguration)
criteria.get(JWTSignatureSigningConfigurationCriterion.class).getConfigurations().get(0);
config.setSigningCredentials(List.of(createRSASigningCredential(new RSAKeyGenerator(2048)
@@ -210,8 +210,8 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
criteria.add(new StaticCredentialCriterion(createClientSecretCredential("atestsecret")));
// Add an RSA type to the security config
- final BasicJWTSignatureSigningConfiguration config =
- (BasicJWTSignatureSigningConfiguration)
+ final BasicSignatureSigningConfiguration config =
+ (BasicSignatureSigningConfiguration)
criteria.get(JWTSignatureSigningConfigurationCriterion.class).getConfigurations().get(0);
config.setSigningCredentials(List.of(createRSASigningCredential(
@@ -234,7 +234,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
private CriteriaSet buildCriteria(final List<String> supportedSigningAlgos) {
final CriteriaSet crit = new CriteriaSet();
- final BasicJWTSignatureSigningConfiguration config = new BasicJWTSignatureSigningConfiguration();
+ final BasicSignatureSigningConfiguration config = new BasicSignatureSigningConfiguration();
config.setSignatureAlgorithms(supportedSigningAlgos);
crit.add(new JWTSignatureSigningConfigurationCriterion(List.of(config)));
return crit;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list