[java-plugin-shibd-oidc] 04/06: JSHIBDOIDC-31 - Support new CredentialResolver service

[Codeberg]

This is an automated email from the git hooks/post-receive script.

codeberg pushed a commit to branch dev/JSHIBDOIDC-31-cred-resolver
in repository java-plugin-shibd-oidc.

View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd-oidc/commit/6f34c91664cf7e176feb898a34c4dfd601d4cc32

commit 6f34c91664cf7e176feb898a34c4dfd601d4cc32
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Aug 3 13:36:50 2026 +0100

    JSHIBDOIDC-31 - Support new CredentialResolver service
    
     - Cleanup the postconfig.xml configuration
    
    https://shibboleth.atlassian.net/browse/JSHIBDOIDC-31
---
 .../net/shibboleth/sp/service/agent/postconfig.xml | 47 ++++++++++------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/sp/service/agent/postconfig.xml b/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/sp/service/agent/postconfig.xml
index 3829842..d938d4f 100644
--- a/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/sp/service/agent/postconfig.xml
+++ b/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/sp/service/agent/postconfig.xml
@@ -291,24 +291,7 @@
         A resolver to public/private key encryption keys global to the RP 
     -->
     
-    <!-- This bridges the bean below that resolves decryption keys into our service while adding needed criteria. -->
-    <bean id="localDecryptionKEKResolver" class="net.shibboleth.sp.jose.config.impl.StaticFilteringCriterionCredentialResolver"
-            c:resolver-ref="shibboleth.sp.CredentialResolverBridge">
-        <constructor-arg name="criteria">
-            <set>
-                <bean class="org.opensaml.security.criteria.UsageCriterion">
-                    <constructor-arg>
-                        <util:constant static-field="org.opensaml.security.credential.UsageType.ENCRYPTION" />
-                    </constructor-arg>
-                </bean>
-                <bean class="org.opensaml.saml.criterion.ProtocolCriterion">
-                    <constructor-arg>
-                        <util:constant static-field="net.shibboleth.oidc.saml.xmlobject.Constants.OIDC_PROTOCOL_URI" />
-                    </constructor-arg>
-                </bean>
-            </set>
-        </constructor-arg>
-    </bean>
+    
     
     <bean id="defaultOIDCKeyDecryptionCredentialResolver"
         class="net.shibboleth.oidc.security.credential.impl.ChainingJOSEObjectCredentialResolver">
@@ -320,13 +303,27 @@
                 credential resolvers to use in matching local keys.
              -->
                 <bean id="localDecryptionCredentialResolver" 
-                    class="net.shibboleth.oidc.security.credential.impl.LocalJOSEObjectCredentialResolver"
-                    c:localCredentialResolver-ref="localDecryptionKEKResolver">
-                    <!-- <constructor-arg name="localCredentialResolver">
-                        <bean 
-                            class="net.shibboleth.oidc.security.credential.impl.CollectionJOSEObjectCredentialResolver"
-                            c:credentials-ref="shibboleth.oidc.EncryptionCredentials" />
-                    </constructor-arg> -->
+                    class="net.shibboleth.oidc.security.credential.impl.LocalJOSEObjectCredentialResolver">
+                    <constructor-arg name="localCredentialResolver">
+                            <!-- This bridge resolves decryption keys using the CredentialResolver service while adding needed criteria. -->
+						    <bean id="localDecryptionKEKResolver" class="net.shibboleth.sp.jose.config.impl.StaticFilteringCriterionCredentialResolver"
+						            c:resolver-ref="shibboleth.sp.CredentialResolverBridge">
+						        <constructor-arg name="criteria">
+						            <set>
+						                <bean class="org.opensaml.security.criteria.UsageCriterion">
+						                    <constructor-arg>
+						                        <util:constant static-field="org.opensaml.security.credential.UsageType.ENCRYPTION" />
+						                    </constructor-arg>
+						                </bean>
+						                <bean class="org.opensaml.saml.criterion.ProtocolCriterion">
+						                    <constructor-arg>
+						                        <util:constant static-field="net.shibboleth.oidc.saml.xmlobject.Constants.OIDC_PROTOCOL_URI" />
+						                    </constructor-arg>
+						                </bean>
+						            </set>
+						        </constructor-arg>
+						    </bean>
+                    </constructor-arg>
                 </bean>
                 <bean id="CriterionCredentialResolver"
                     class="net.shibboleth.oidc.security.credential.impl.ClientSecretCriterionCredentialResolver"/>

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