[java-idp-plugin-oidc-rp] branch main updated: Fix predicate location after move to commons
Phil Smart
philip.smart at jisc.ac.uk
Mon Feb 20 17:14:20 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=a4b2a99dfe9214b59d7d1dc71fdc9303ae4ef392
The following commit(s) were added to refs/heads/main by this push:
new a4b2a99 Fix predicate location after move to commons
a4b2a99 is described below
commit a4b2a99dfe9214b59d7d1dc71fdc9303ae4ef392
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Feb 20 17:14:18 2023 +0000
Fix predicate location after move to commons
---
.../oidc-relying-party-authn-beans.xml | 6 +++---
...lyingPartyProxySigningParametersResolverTest.java | 20 ++++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
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 700d0ab..2295310 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
@@ -159,11 +159,11 @@
class="net.shibboleth.idp.plugin.authn.oidc.rp.messaging.context.logic.RequestObjectRequiredAndSupported" />
<bean id="shibboleth.authn.oidc.rp.SignRequestObjectProxyCondition"
- class="net.shibboleth.idp.plugin.authn.oidc.rp.config.logic.SignRequestObjectPredicate"
+ class="net.shibboleth.oidc.profile.config.logic.SignRequestObjectPredicate"
p:relyingPartyContextLookupStrategy-ref="shibboleth.ChildLookup.Proxy.RelyingPartyContext" />
<bean id="EncryptRequestObjectCondition"
- class="net.shibboleth.idp.plugin.authn.oidc.rp.config.logic.EncryptRequestObjectPredicate"
+ class="net.shibboleth.oidc.profile.config.logic.EncryptRequestObjectPredicate"
p:relyingPartyContextLookupStrategy-ref="shibboleth.ChildLookup.RelyingParty" />
<bean id="PopulateRequestObjectSignatureSigningParameters" scope="prototype"
@@ -232,7 +232,7 @@
p:requestObjectToBeSignedPredicate-ref="shibboleth.authn.oidc.rp.SignRequestObjectCondition" />
<bean id="shibboleth.authn.oidc.rp.SignRequestObjectCondition"
- class="net.shibboleth.idp.plugin.authn.oidc.rp.config.logic.SignRequestObjectPredicate"
+ class="net.shibboleth.oidc.profile.config.logic.SignRequestObjectPredicate"
p:relyingPartyContextLookupStrategy-ref="shibboleth.ChildLookup.RelyingParty" />
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 aa0a41c..965c006 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
@@ -67,7 +67,7 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDCTest {
/** A 256 bit client_secret.*/
- private static final String TWO_FIVE_SIX_BIT_CLIENT_SECRET = "!A%D*G-KaPdSgVkYp3s6v8y/B?E(H+Mb";
+ private static final String CLIENT_SECRET_256 = "!A%D*G-KaPdSgVkYp3s6v8y/B?E(H+Mb";
private RelyingPartyProxySigningParametersResolver resolver;
@@ -105,7 +105,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 ClientSecretCredentialCriterion(
- new DefaultClientSecretCredential(TWO_FIVE_SIX_BIT_CLIENT_SECRET)));
+ new DefaultClientSecretCredential(CLIENT_SECRET_256)));
final Iterable<SignatureSigningParameters> params = resolver.resolve(criteria);
assertNotNull(params);
assertTrue(params.iterator().hasNext());
@@ -117,7 +117,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 ClientSecretCredentialCriterion(
- new DefaultClientSecretCredential(TWO_FIVE_SIX_BIT_CLIENT_SECRET)));
+ new DefaultClientSecretCredential(CLIENT_SECRET_256)));
final Iterable<SignatureSigningParameters> params = resolver.resolve(criteria);
assertNotNull(params);
assertFalse(params.iterator().hasNext());
@@ -128,7 +128,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 ClientSecretCredentialCriterion(
- new DefaultClientSecretCredential(TWO_FIVE_SIX_BIT_CLIENT_SECRET)));;
+ new DefaultClientSecretCredential(CLIENT_SECRET_256)));;
final Iterable<SignatureSigningParameters> params = resolver.resolve(criteria);
assertNotNull(params);
assertTrue(params.iterator().hasNext());
@@ -141,7 +141,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 ClientSecretCredentialCriterion(
- new DefaultClientSecretCredential(TWO_FIVE_SIX_BIT_CLIENT_SECRET)));
+ new DefaultClientSecretCredential(CLIENT_SECRET_256)));
// Now let the OP support one of those which matches the credential
final OIDCProviderMetadata metadata =
@@ -161,7 +161,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 ClientSecretCredentialCriterion(
- new DefaultClientSecretCredential(TWO_FIVE_SIX_BIT_CLIENT_SECRET)));
+ new DefaultClientSecretCredential(CLIENT_SECRET_256)));
// Now let the OP support none of those supported by the config
final OIDCProviderMetadata metadata =
@@ -181,7 +181,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
// Create the normal client_secret
criteria.add(new ClientSecretCredentialCriterion(
- new DefaultClientSecretCredential(TWO_FIVE_SIX_BIT_CLIENT_SECRET)));
+ new DefaultClientSecretCredential(CLIENT_SECRET_256)));
// Add an RSA type to the security config
final BasicSignatureSigningConfiguration config =
@@ -215,7 +215,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
// Create the normal client_secret
criteria.add(new ClientSecretCredentialCriterion(
- new DefaultClientSecretCredential(TWO_FIVE_SIX_BIT_CLIENT_SECRET)));
+ new DefaultClientSecretCredential(CLIENT_SECRET_256)));
// Add an RSA type to the security config
final BasicSignatureSigningConfiguration config =
@@ -246,7 +246,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
// Create the normal client_secret
criteria.add(new ClientSecretCredentialCriterion(
- new DefaultClientSecretCredential(TWO_FIVE_SIX_BIT_CLIENT_SECRET)));
+ new DefaultClientSecretCredential(CLIENT_SECRET_256)));
final BasicSignatureSigningConfiguration config =
(BasicSignatureSigningConfiguration)
@@ -272,7 +272,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
// Create the normal client_secret
criteria.add(new ClientSecretCredentialCriterion(
- new DefaultClientSecretCredential(TWO_FIVE_SIX_BIT_CLIENT_SECRET)));
+ new DefaultClientSecretCredential(CLIENT_SECRET_256)));
final BasicSignatureSigningConfiguration config =
(BasicSignatureSigningConfiguration)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list