[java-idp-plugin-oidc-rp] branch main updated: Fix keyset NPE when no keys configured

[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=9bec3ff7e3f83258b2ee80b1a02bba723c1aa16f

The following commit(s) were added to refs/heads/main by this push:
     new 9bec3ff  Fix keyset NPE when no keys configured
9bec3ff is described below

commit 9bec3ff7e3f83258b2ee80b1a02bba723c1aa16f
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Dec 2 09:24:45 2022 +0000

    Fix keyset NPE when no keys configured
---
 .../net/shibboleth/idp/service/relying-party/postconfig.xml         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index edbfab8..d9300fd 100644
--- a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -110,9 +110,13 @@
         <property name="KEKCredentialResolver">
             <bean id="defaultOIDCRPKeyDecryptionCredentialResolver"
                     class="net.shibboleth.oidc.security.credential.impl.ReturnAllCollectionJOSEObjectCredentialResolver"
-                    c:credentials="#{getObject('shibboleth.authn.oidc.rp.EncryptionCredentialsToPublish') ?: getObject('shibboleth.authn.oidc.rp.DefaultKeyEncryptionCredentials')}"/>
+                    c:credentials="#{getObject('shibboleth.authn.oidc.rp.EncryptionCredentialsToPublish') ?: getObject('shibboleth.authn.oidc.rp.DefaultEncryptionCredentialsToPublish')}"/>
         </property>    
     </bean>
+    
+    <bean id="shibboleth.authn.oidc.rp.DefaultEncryptionCredentialsToPublish"
+        class="net.shibboleth.idp.plugin.authn.oidc.rp.config.CredentialsListFactory"
+        c:_0="#{getObject('shibboleth.authn.oidc.rp.DefaultKeyEncryptionCredentials')}" />
      
 
     <bean id="shibboleth.authn.oidc.rp.DefaultSecurityConfiguration"

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