[java-plugin-shibd-saml] branch main updated: Auto-wiring of keys into Application beans.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-plugin-shibd-saml.

View the commit online:
http://git.shibboleth.net/view/?p=java-plugin-shibd-saml.git;a=commit;h=9b8f9813a67299c2ff88b3443f605e9edc82c047

The following commit(s) were added to refs/heads/main by this push:
     new 9b8f981  Auto-wiring of keys into Application beans.
9b8f981 is described below

commit 9b8f9813a67299c2ff88b3443f605e9edc82c047
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Aug 18 15:33:26 2025 -0400

    Auto-wiring of keys into Application beans.
---
 .../net/shibboleth/sp/service/agent/postconfig.xml        | 14 ++++++++++++++
 .../shibboleth/idp/module/conf/sp/saml-credentials.xml    | 15 +++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/sp/service/agent/postconfig.xml b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/sp/service/agent/postconfig.xml
index 2952663..ea8cce3 100644
--- a/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/sp/service/agent/postconfig.xml
+++ b/sp-saml-conf-impl/src/main/resources/META-INF/net/shibboleth/sp/service/agent/postconfig.xml
@@ -17,6 +17,20 @@
     <!-- Import parent beans for metadata-driven configuration approach. -->
 <!--     <import resource="relying-party-mddriven.xml" /> -->
 
+
+    <!--
+    Auto-wiring exposers for credentials to get them loaded into the agent resolver.
+    The qualifiers control which auto-wiring point is used.
+    -->
+    <bean class="net.shibboleth.spring.security.CredentialHolder"
+            c:_0="#{getObject('shibboleth.sp.SigningCredentials')}">
+        <qualifier value="signing"/>
+    </bean>
+    <bean class="net.shibboleth.spring.security.CredentialHolder"
+            c:_0="#{getObject('shibboleth.sp.EncryptionCredentials')}">
+        <qualifier value="encryption"/>
+    </bean>
+
     <!--
     Default Profile Configurations, also usable as parent beans in overrides.
     
diff --git a/sp-saml-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/saml-credentials.xml b/sp-saml-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/saml-credentials.xml
index b9dfb91..bb6084f 100644
--- a/sp-saml-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/saml-credentials.xml
+++ b/sp-saml-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/sp/saml-credentials.xml
@@ -19,6 +19,14 @@
     credentials here for convenience and reference them as needed.
     -->
     
+    <!--
+    The list of ALL of your SP's' signing credentials. If you define additional signing credentials,
+    for example for specific relying parties or different key types, make sure to include them within this list.
+    -->
+    <util:list id="shibboleth.sp.SigningCredentials">
+        <ref bean="shibboleth.sp.DefaultSigningCredential" />
+    </util:list>
+    
     <!-- Your SP's default signing key, set via property file. -->
     <bean id="shibboleth.sp.DefaultSigningCredential" parent="shibboleth.BasicX509CredentialFactoryBean"
         p:privateKeyResource="%{sp.saml.signing.key}"
@@ -27,6 +35,13 @@
     <!-- Your SPs default client TLS credential, by default the same as the default signing credential. -->
     <alias alias="shibboleth.sp.DefaultClientTLSCredential" name="shibboleth.sp.DefaultSigningCredential" />
             
+    <!--
+    The list of ALL of your SP's' encryption credentials. By default this is just an alias
+    for 'shibboleth.DefaultEncryptionCredentials'. It could be re-defined as
+    a list with additional credentials if needed.
+    -->
+    <alias alias="shibboleth.sp.EncryptionCredentials" name="shibboleth.sp.DefaultEncryptionCredentials" />
+            
     <!-- Your SP's default encryption (really decryption) keys, set via property file. -->
     <util:list id="shibboleth.sp.DefaultEncryptionCredentials">
     

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