[java-idp-plugin-webauthn] branch main updated: JWEBAUTHN-40 - Credential repository injection/configuration is not consistent

[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-webauthn.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-webauthn.git;a=commit;h=6f8f287b95735eb6879266f41d6ed3c196b8a224

The following commit(s) were added to refs/heads/main by this push:
     new 6f8f287  JWEBAUTHN-40 - Credential repository injection/configuration is not consistent
6f8f287 is described below

commit 6f8f287b95735eb6879266f41d6ed3c196b8a224
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Jan 8 16:18:08 2025 +0000

    JWEBAUTHN-40 - Credential repository injection/configuration is not
    consistent
    
     - make credential repository injection consistent
     - make webAuthnClient injection consistent
    
    https://shibboleth.atlassian.net/browse/JWEBAUTHN-40
---
 .../src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml     | 2 +-
 .../flows/admin/webauthn-registration/webauthn-registration-beans.xml | 2 +-
 .../shibboleth/idp/flows/authn/WebAuthn/webauthn-abstract-beans.xml   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webauthn-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/webauthn-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index f6b0970..e2abdde 100644
--- a/webauthn-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/webauthn-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -91,7 +91,7 @@
         p:allowUntrustedAttestation="%{idp.authn.webauthn.allowUntrustedAttestation:true}"
         p:origins="%{idp.authn.webauthn.origins:}"
         p:preferredPublickeyParams="%{idp.authn.webauthn.preferredPublicKeyParams:EdDSA,ES256,ES384,ES512,RS1,RS256,RS384,RS512}"
-        p:credentialRepository-ref="shibboleth.authn.WebAuthn.DefaultCredentialRepository"
+        p:credentialRepository="#{getObject('shibboleth.authn.WebAuthn.CredentialRepository') ?: getObject('shibboleth.authn.WebAuthn.DefaultCredentialRepository')}"
         p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
     
         
diff --git a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-registration/webauthn-registration-beans.xml b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-registration/webauthn-registration-beans.xml
index 361d5bc..51b6146 100644
--- a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-registration/webauthn-registration-beans.xml
+++ b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-registration/webauthn-registration-beans.xml
@@ -203,7 +203,7 @@
 
     <bean id="StorePublicKeyCredential" parent="AbstractWebAuthnRegistrationAction" scope="prototype"
         class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.StorePublicKeyCredential"
-        p:credentialRepository-ref="shibboleth.authn.WebAuthn.DefaultCredentialRepository"
+        p:credentialRepository="#{getObject('shibboleth.authn.WebAuthn.CredentialRepository') ?: getObject('shibboleth.authn.WebAuthn.DefaultCredentialRepository')}"
         p:populateAuditContextAction="#{%{idp.authn.webauthn.registration.audit.enabled:false} ? getObject('RegistrationOperationPopulateAuditContext') : null}"
         p:writeAuditLogAction="#{%{idp.authn.webauthn.registration.audit.enabled:false} ? getObject('WriteAdminAuditLog') : null}"
         p:auditContextCreationStrategy-ref="AdminAuditContextLookup" />    
diff --git a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthn/webauthn-abstract-beans.xml b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthn/webauthn-abstract-beans.xml
index e75cce9..7fd2dda 100644
--- a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthn/webauthn-abstract-beans.xml
+++ b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthn/webauthn-abstract-beans.xml
@@ -29,8 +29,8 @@
     <!-- Abstract parent beans -->        
       
     <bean id="AbstractWebAuthnBaseAction" scope="prototype" abstract="true"
-        p:webAuthnClient="#{getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnAuthenticationClientFactory')}"
-        p:credentialRepository="#{getObject('shibboleth.authn.WebAuthn.DefaultCredentialRepository')}"
+        p:webAuthnClient="#{getObject('shibboleth.authn.WebAuthn.WebAuthnAuthenticationClientFactory') ?: getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnAuthenticationClientFactory')}"
+        p:credentialRepository="#{getObject('shibboleth.authn.WebAuthn.CredentialRepository') ?: getObject('shibboleth.authn.WebAuthn.DefaultCredentialRepository')}"
         p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnFidoMetadataServiceFactory')}"
         p:aaguidService="#{'false'.equals('%{idp.authn.webauthn.metadata.aaguid.enabled:false}') ? null : getObject('shibboleth.authn.WebAuthn.DefaultPasskeyAaguidMetadataServiceFactory')}"/>
     

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