[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 13:26:02 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=97efe0a5cd4ad7fbcb2c3a85da584bec24936d9f
The following commit(s) were added to refs/heads/main by this push:
new 97efe0a JCOMOIDC-60 - JWT class naming convention
97efe0a is described below
commit 97efe0a5cd4ad7fbcb2c3a85da584bec24936d9f
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Jan 11 13:25:59 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/plugin/authn/oidc/rp/impl/DecryptJWT.java | 4 ++--
.../impl/RelyingPartyProxySigningParametersResolver.java | 13 ++++++-------
.../OIDCRelyingParty/oidc-relying-party-authn-beans.xml | 12 ++++++------
.../authn/oidc/rp/impl/AuthorizationControllerTest.java | 4 ++--
.../RelyingPartyProxySigningParametersResolverTest.java | 16 ++++++++--------
5 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/DecryptJWT.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/DecryptJWT.java
index 226c998..bc50a06 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/DecryptJWT.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/DecryptJWT.java
@@ -38,9 +38,9 @@ import com.nimbusds.jwt.JWT;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.oidc.profile.core.OidcEventIds;
-import net.shibboleth.oidc.security.JWTDecryptionParameters;
import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.impl.JWTDecrypter;
+import net.shibboleth.oidc.security.jose.DecryptionParameters;
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;
@@ -155,7 +155,7 @@ public class DecryptJWT extends AbstractProfileAction {
ActionSupport.buildEvent(profileRequestContext, EventIds.INVALID_SEC_CFG);
return false;
} else {
- final JWTDecryptionParameters params = paramsCtx.getDecryptionParameters();
+ final DecryptionParameters params = paramsCtx.getDecryptionParameters();
decrypter = new JWTDecrypter(params);
}
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolver.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolver.java
index 5729c9b..9821b7a 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolver.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolver.java
@@ -29,7 +29,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opensaml.security.credential.Credential;
-import org.opensaml.xmlsec.impl.BasicSignatureSigningParametersResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,11 +37,11 @@ import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.jose.jwk.Curve;
import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
-import net.shibboleth.oidc.security.JWTSignatureSigningParameters;
+import net.shibboleth.oidc.security.credential.impl.CredentialConversionUtil;
import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
import net.shibboleth.oidc.security.criterion.StaticCredentialCriterion;
-import net.shibboleth.oidc.security.impl.BasicJWTSignatureSigningParametersResolver;
-import net.shibboleth.oidc.security.impl.CredentialConversionUtil;
+import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
+import net.shibboleth.oidc.security.jose.impl.BasicSignatureSigningParametersResolver;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -57,14 +56,14 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
*
* * <p>
* In addition to the {@link net.shibboleth.utilities.java.support.resolver.Criterion} inputs documented in
- * {@link BasicSignatureSigningParametersResolver}, the following inputs are also supported:
+ * {@link JWTBasicSignatureSigningParametersResolver}, the following inputs are also supported:
* </p>
* <ul>
* <li>{@link StaticCredentialCriterion} - optional</li>
* <li>{@link ProviderMetadataCriterion} - required</li>
* </ul>
*/
-public class RelyingPartyProxySigningParametersResolver extends BasicJWTSignatureSigningParametersResolver {
+public class RelyingPartyProxySigningParametersResolver extends BasicSignatureSigningParametersResolver {
/** Logger. */
@Nonnull
@@ -97,7 +96,7 @@ public class RelyingPartyProxySigningParametersResolver extends BasicJWTSignatur
// Checkstyle: CyclomaticComplexity|ReturnCount OFF
@Override
protected void resolveAndPopulateCredentialAndSignatureAlgorithm(
- @Nonnull final JWTSignatureSigningParameters params,
+ @Nonnull final SignatureSigningParameters params,
@Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> includeExcludePredicate) {
final List<Credential> allCredentials = new ArrayList<>();
diff --git a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-beans.xml b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-beans.xml
index f9b65ec..483d291 100644
--- a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-beans.xml
+++ b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-beans.xml
@@ -200,10 +200,10 @@
<!-- TODO Should the resolvers move to the post-config as they are global singletons -->
<bean id="shibboleth.authn.oidc.rp.EncryptionParametersResolver"
- class="net.shibboleth.oidc.security.impl.DefaultJWTEncryptionParametersResolver">
+ class="net.shibboleth.oidc.security.jose.impl.DefaultEncryptionParametersResolver">
<property name="keyTransportEncryptionAlgorithmsLookupStrategy">
<bean
- class="net.shibboleth.oidc.security.impl.ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategy">
+ class="net.shibboleth.oidc.security.jose.impl.ProviderMetadataKeyTransportEncryptionAlgorithmsLookupStrategy">
<constructor-arg>
<bean
class="net.shibboleth.oidc.profile.config.navigate.ProviderMetadataStringValuesLookupFunction"
@@ -212,7 +212,7 @@
</bean>
</property>
<property name="dataEncryptionAlgorithmsLookupStrategy">
- <bean class="net.shibboleth.oidc.security.impl.ProviderMetadataDataEncryptionAlgorithmsLookupStrategy">
+ <bean class="net.shibboleth.oidc.security.jose.impl.ProviderMetadataDataEncryptionAlgorithmsLookupStrategy">
<constructor-arg>
<bean
class="net.shibboleth.oidc.profile.config.navigate.ProviderMetadataStringValuesLookupFunction"
@@ -435,7 +435,7 @@
p:decryptionParametersResolver-ref="JWTDecryptionParametersResolver" />
<bean id="JWTDecryptionParametersResolver"
- class="net.shibboleth.oidc.security.impl.DefaultJWTDecryptionParametersResolver" />
+ class="net.shibboleth.oidc.security.jose.impl.DefaultDecryptionParametersResolver" />
<bean id="IDTokenDecryptionConfigurationLookup" lazy-init="true"
class="net.shibboleth.oidc.profile.config.navigate.JWTDecryptionConfigurationLookupFunction"
@@ -470,7 +470,7 @@
<bean scope="prototype" class="net.shibboleth.oidc.profile.impl.PopulateJWTSignatureValidationParametersHandler">
<property name="signatureValidationParametersResolver">
- <bean class="net.shibboleth.oidc.security.impl.BasicJWTSignatureValidationParametersResolver" />
+ <bean class="net.shibboleth.oidc.security.jose.impl.BasicSignatureValidationParametersResolver" />
</property>
<property name="configurationLookupStrategy">
<bean class="net.shibboleth.oidc.profile.config.navigate.MessageContextLookupFunctionAdaptor">
@@ -742,7 +742,7 @@
<bean scope="prototype" class="net.shibboleth.oidc.profile.impl.PopulateJWTSignatureValidationParametersHandler">
<property name="signatureValidationParametersResolver">
- <bean class="net.shibboleth.oidc.security.impl.BasicJWTSignatureValidationParametersResolver" />
+ <bean class="net.shibboleth.oidc.security.jose.impl.BasicSignatureValidationParametersResolver" />
</property>
<property name="configurationLookupStrategy">
<bean class="net.shibboleth.oidc.profile.config.navigate.MessageContextLookupFunctionAdaptor">
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AuthorizationControllerTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AuthorizationControllerTest.java
index 1301687..4d623fb 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AuthorizationControllerTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/AuthorizationControllerTest.java
@@ -102,10 +102,10 @@ import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration.OIDCHtt
import net.shibboleth.oidc.profile.core.OIDCAuthenticationRequest;
import net.shibboleth.oidc.profile.decoding.OIDCMessageDecoder;
import net.shibboleth.oidc.profile.encoding.impl.AbstractOIDCMessageEncoder;
-import net.shibboleth.oidc.security.JWTSignatureSigningParameters;
import net.shibboleth.oidc.security.context.JWTSecurityParametersContext;
import net.shibboleth.oidc.security.impl.EncryptJWTHandler;
import net.shibboleth.oidc.security.impl.SignJWTHandler;
+import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.net.HttpServletSupport;
import net.shibboleth.utilities.java.support.net.URLBuilder;
@@ -337,7 +337,7 @@ public class AuthorizationControllerTest extends AbstractTestNGSpringContextTest
// Create a sec context under the nested prc outbound msg context
final var secContext = prc.getOutboundMessageContext().getSubcontext(JWTSecurityParametersContext.class, true);
- final var sigParams = new JWTSignatureSigningParameters();
+ final var sigParams = new SignatureSigningParameters();
sigParams.setSignatureAlgorithm("HS256");
sigParams.setSigningCredential(TestCredentialHelper.createClientSecretCredential(CLIENT_SECRET));
secContext.setSignatureSigningParameters(sigParams);
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 c183892..eb89ba3 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
@@ -54,13 +54,13 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.oidc.jwa.support.SignatureConstants;
import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
-import net.shibboleth.oidc.security.JWTSignatureSigningParameters;
import net.shibboleth.oidc.security.credential.BasicExpiringJWKCredential;
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.JWSAssemblyUtils;
+import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
import net.shibboleth.oidc.security.jose.impl.BasicSignatureSigningConfiguration;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -104,7 +104,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
public void testResolveSuccess_StaticCredentials() throws ResolverException {
final CriteriaSet criteria = buildCriteria(List.of(SignatureConstants.ALGO_ID_SIGNATURE_HS_256));
criteria.add(new StaticCredentialCriterion(createClientSecretCredential("atestsecret")));
- final Iterable<JWTSignatureSigningParameters> params = resolver.resolve(criteria);
+ final Iterable<SignatureSigningParameters> params = resolver.resolve(criteria);
assertNotNull(params);
assertTrue(params.iterator().hasNext());
assertNotNull(params.iterator().next().getSigningCredential());
@@ -115,7 +115,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
public void testResolveFail_StaticCredentials_UnsupportedMethod() throws ResolverException {
final CriteriaSet criteria = buildCriteria(List.of(SignatureConstants.ALGO_ID_SIGNATURE_RS_256));
criteria.add(new StaticCredentialCriterion(createClientSecretCredential("atestsecret")));
- final Iterable<JWTSignatureSigningParameters> params = resolver.resolve(criteria);
+ final Iterable<SignatureSigningParameters> params = resolver.resolve(criteria);
assertNotNull(params);
assertFalse(params.iterator().hasNext());
}
@@ -125,7 +125,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
final CriteriaSet criteria = buildCriteria(List.of(SignatureConstants.ALGO_ID_SIGNATURE_RS_256,
SignatureConstants.ALGO_ID_SIGNATURE_HS_256));
criteria.add(new StaticCredentialCriterion(createClientSecretCredential("atestsecret")));
- final Iterable<JWTSignatureSigningParameters> params = resolver.resolve(criteria);
+ final Iterable<SignatureSigningParameters> params = resolver.resolve(criteria);
assertNotNull(params);
assertTrue(params.iterator().hasNext());
assertNotNull(params.iterator().next().getSigningCredential());
@@ -144,7 +144,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
metadata.setRequestObjectJWSAlgs(List.of(JWSAlgorithm.HS256));
criteria.add(new ProviderMetadataCriterion(metadata));
- final Iterable<JWTSignatureSigningParameters> params = resolver.resolve(criteria);
+ final Iterable<SignatureSigningParameters> params = resolver.resolve(criteria);
assertNotNull(params);
assertTrue(params.iterator().hasNext());
assertNotNull(params.iterator().next().getSigningCredential());
@@ -163,7 +163,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
metadata.setRequestObjectJWSAlgs(List.of(JWSAlgorithm.EdDSA));
criteria.add(new ProviderMetadataCriterion(metadata));
- final Iterable<JWTSignatureSigningParameters> params = resolver.resolve(criteria);
+ final Iterable<SignatureSigningParameters> params = resolver.resolve(criteria);
assertNotNull(params);
assertFalse(params.iterator().hasNext());
}
@@ -192,7 +192,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
metadata.setRequestObjectJWSAlgs(List.of(JWSAlgorithm.RS256));
criteria.add(new ProviderMetadataCriterion(metadata));
- final Iterable<JWTSignatureSigningParameters> params = resolver.resolve(criteria);
+ final Iterable<SignatureSigningParameters> params = resolver.resolve(criteria);
assertNotNull(params);
assertTrue(params.iterator().hasNext());
assertNotNull(params.iterator().next().getSigningCredential());
@@ -223,7 +223,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
metadata.setRequestObjectJWSAlgs(List.of(JWSAlgorithm.ES256, JWSAlgorithm.RS256));
criteria.add(new ProviderMetadataCriterion(metadata));
- final Iterable<JWTSignatureSigningParameters> params = resolver.resolve(criteria);
+ final Iterable<SignatureSigningParameters> params = resolver.resolve(criteria);
assertNotNull(params);
assertTrue(params.iterator().hasNext());
assertNotNull(params.iterator().next().getSigningCredential());
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list