[java-oidc-common] 02/02: Move credential factories to API
Phil Smart
philip.smart at jisc.ac.uk
Wed Apr 19 13:58:37 UTC 2023
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch dev/JCOMOIDC-66
in repository java-oidc-common.
View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=b65253496cf2db591335306ecea02c91617d4b33
commit b65253496cf2db591335306ecea02c91617d4b33
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Apr 19 14:55:06 2023 +0100
Move credential factories to API
---
.../BasicClientSecretCredentialFactoryBean.java | 4 +-
.../credential}/BasicJWKCredentialFactoryBean.java | 3 +-
.../FormOutboundKeySetResponseMessageTest.java | 53 +++++++++++++++++++---
3 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/BasicClientSecretCredentialFactoryBean.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/credential/BasicClientSecretCredentialFactoryBean.java
similarity index 91%
rename from oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/BasicClientSecretCredentialFactoryBean.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/credential/BasicClientSecretCredentialFactoryBean.java
index 3bc2d28..dbf4be4 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/BasicClientSecretCredentialFactoryBean.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/credential/BasicClientSecretCredentialFactoryBean.java
@@ -15,14 +15,12 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.credential.impl;
+package net.shibboleth.oidc.security.credential;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.shibboleth.ext.spring.factory.AbstractComponentAwareFactoryBean;
-import net.shibboleth.oidc.security.credential.ClientSecretCredential;
-import net.shibboleth.oidc.security.credential.DefaultClientSecretCredential;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/BasicJWKCredentialFactoryBean.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/credential/BasicJWKCredentialFactoryBean.java
similarity index 97%
rename from oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/BasicJWKCredentialFactoryBean.java
rename to oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/credential/BasicJWKCredentialFactoryBean.java
index 19b60c3..2c7b80d 100644
--- a/oidc-common-crypto-impl/src/main/java/net/shibboleth/oidc/security/credential/impl/BasicJWKCredentialFactoryBean.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/security/credential/BasicJWKCredentialFactoryBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.oidc.security.credential.impl;
+package net.shibboleth.oidc.security.credential;
import java.io.IOException;
import java.io.InputStream;
@@ -39,7 +39,6 @@ import com.nimbusds.jose.jwk.OctetSequenceKey;
import net.shibboleth.idp.profile.spring.factory.AbstractCredentialFactoryBean;
import net.shibboleth.oidc.security.CredentialConversionUtil;
-import net.shibboleth.oidc.security.credential.BasicJWKCredential;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
index 730f232..fa47b5f 100644
--- a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
+++ b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
@@ -21,6 +21,8 @@ import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
+import javax.annotation.Nonnull;
+
import org.mockito.Mockito;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.profile.action.EventIds;
@@ -44,14 +46,18 @@ import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileR
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
-import net.shibboleth.oidc.profile.config.OIDCPublishKeySetConfiguration;
+import net.shibboleth.oidc.profile.config.impl.DefaultOIDCPublishKeySetConfiguration;
import net.shibboleth.oidc.profile.config.navigate.JWKCredentialsToPublishLookupStrategy;
import net.shibboleth.oidc.profile.messaging.JSONSuccessResponse;
-import net.shibboleth.oidc.security.credential.impl.BasicJWKCredentialFactoryBean;
-import net.shibboleth.oidc.security.credential.impl.ReturnAllCollectionJOSEObjectCredentialResolver;
+import net.shibboleth.oidc.security.credential.BasicJWKCredentialFactoryBean;
+import net.shibboleth.oidc.security.credential.JOSEObjectCredentialResolver;
import net.shibboleth.oidc.security.jose.DecryptionConfiguration;
import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
+import net.shibboleth.utilities.java.support.resolver.ResolverException;
/** {@link FormOutboundKeySetResponseMessage} unit test. */
public class FormOutboundKeySetResponseMessageTest {
@@ -62,7 +68,7 @@ public class FormOutboundKeySetResponseMessageTest {
private RequestContext requestCtx;
- private OIDCPublishKeySetConfiguration profileConf;
+ private DefaultOIDCPublishKeySetConfiguration profileConf;
private RelyingPartyContext rpCtx;
@@ -94,13 +100,14 @@ public class FormOutboundKeySetResponseMessageTest {
final SignatureSigningConfiguration signConfig = Mockito.mock(SignatureSigningConfiguration.class);
Mockito.when(signConfig.getSigningCredentials()).thenReturn(signCreds);
final DecryptionConfiguration decConfig = Mockito.mock(DecryptionConfiguration.class);
- final ReturnAllCollectionJOSEObjectCredentialResolver resolver = new ReturnAllCollectionJOSEObjectCredentialResolver(encCreds);
+ final MockReturnAllCollectionJOSEObjectCredentialResolver resolver =
+ new MockReturnAllCollectionJOSEObjectCredentialResolver(encCreds);
Mockito.when(decConfig.getKEKCredentialResolver()).thenReturn(resolver);
final JSONSecurityConfiguration secConf = new JSONSecurityConfiguration();
secConf.setJwtSignatureSigningConfiguration(signConfig);
secConf.setJwtDecryptionConfiguration(decConfig);
- profileConf = new OIDCPublishKeySetConfiguration();
+ profileConf = new DefaultOIDCPublishKeySetConfiguration();
profileConf.setSecurityConfiguration(secConf);
rpCtx.setProfileConfig(profileConf);
action = new FormOutboundKeySetResponseMessage();
@@ -178,5 +185,39 @@ public class FormOutboundKeySetResponseMessageTest {
final Event event = action.execute(requestCtx);
ActionTestingSupport.assertEvent(event, IdPEventIds.INVALID_RELYING_PARTY_CTX);
}
+
+ /** Mock resolver which just returns all the credentials it knows.*/
+ private static class MockReturnAllCollectionJOSEObjectCredentialResolver implements JOSEObjectCredentialResolver {
+
+ /** List of credentials held by this resolver. */
+ private final List<Credential> collection;
+
+ /**
+ * Constructor.
+ *
+ * @param credentials collection of credentials to be held by this resolver
+ */
+ public MockReturnAllCollectionJOSEObjectCredentialResolver(
+ @Nonnull @ParameterName(name="credentials") final List<Credential> credentials) {
+ Constraint.isNotNull(credentials, "Input credentials list cannot be null");
+
+ collection = new ArrayList<>(credentials);
+ }
+
+ @Override
+ public Iterable<Credential> resolve(final CriteriaSet criteria) throws ResolverException {
+ return collection;
+ }
+
+ @Override
+ public Credential resolveSingle(final CriteriaSet criteria) throws ResolverException {
+ final Iterable<Credential> creds = resolve(criteria);
+ if (creds.iterator().hasNext()) {
+ return creds.iterator().next();
+ }
+ return null;
+ }
+
+ }
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list