[java-idp-plugin-oidc-rp] branch main updated: Use JWK credentials to publish strategy from commons

[Phil Smart]

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=d844965fc1d71f3754c4b6784336e2d3f7833638

The following commit(s) were added to refs/heads/main by this push:
     new d844965  Use JWK credentials to publish strategy from commons
d844965 is described below

commit d844965fc1d71f3754c4b6784336e2d3f7833638
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Dec 2 11:49:57 2022 +0000

    Use JWK credentials to publish strategy from commons
---
 .../JWKCredentialsToPublishLookupStrategy.java     | 68 ----------------------
 .../idp/flows/oidc/rp/keyset/keyset-beans.xml      |  2 +-
 2 files changed, 1 insertion(+), 69 deletions(-)

diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/keyset/impl/JWKCredentialsToPublishLookupStrategy.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/keyset/impl/JWKCredentialsToPublishLookupStrategy.java
deleted file mode 100644
index 638e671..0000000
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/keyset/impl/JWKCredentialsToPublishLookupStrategy.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements.  See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.plugin.authn.oidc.rp.keyset.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Function;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import org.opensaml.security.credential.Credential;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
-
-/**
- * Strategy to locate the set of JWK credentials to publish in its KeySet document.
- */
-public class JWKCredentialsToPublishLookupStrategy implements Function<OIDCSecurityConfiguration, List<Credential>> {
-    
-    /** Class logger. */
-    @Nonnull private final Logger log = LoggerFactory.getLogger(JWKCredentialsToPublishLookupStrategy.class);
-
-    @Override
-    @Nonnull public List<Credential> apply(@Nullable final OIDCSecurityConfiguration config) {
-        
-        if (config == null) {
-            return Collections.emptyList();
-        }
-        final List<Credential> credentials = new ArrayList<>();
-        
-        if (config.getJwtSignatureSigningConfiguration() != null) {
-            credentials.addAll(config.getJwtSignatureSigningConfiguration().getSigningCredentials());
-        }
-        if (config.getJwtDecryptionConfiguration() != null) {
-            try {
-                final Iterable<Credential> resolvedCreds = 
-                        config.getJwtDecryptionConfiguration().getKEKCredentialResolver().resolve(new CriteriaSet());
-                resolvedCreds.forEach(credentials::add);
-            } catch (final ResolverException e) {
-               log.debug("Unable to resolve decryption credentials", e);
-            }
-
-        }
-        return credentials;
-    }
-
-}
diff --git a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/rp/keyset/keyset-beans.xml b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/rp/keyset/keyset-beans.xml
index 8518006..25c8b77 100644
--- a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/rp/keyset/keyset-beans.xml
+++ b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/rp/keyset/keyset-beans.xml
@@ -46,7 +46,7 @@
                                                 
                                                 
     <bean id="shibboleth.authn.oidc.rp.keyset.DefaultKeySetCredentialsToPublishLookupStrategy" 
-          class="net.shibboleth.idp.plugin.authn.oidc.rp.keyset.impl.JWKCredentialsToPublishLookupStrategy"/> 
+          class="net.shibboleth.oidc.profile.config.navigate.JWKCredentialsToPublishLookupStrategy"/> 
         
     <bean id="EncodeMessage" class="org.opensaml.profile.action.impl.EncodeMessage" scope="prototype"
         p:messageEncoderFactory-ref="shibboleth.authn.oidc.rp.keyset.messageEncoderFactory"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.