[java-idp-plugin-webauthn] branch main updated: Tweak bean names and allow non defaults

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

The following commit(s) were added to refs/heads/main by this push:
     new 9e73afa  Tweak bean names and allow non defaults
9e73afa is described below

commit 9e73afa9184176c7203fd970cc7ff3c1172cdef4
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Aug 14 17:46:11 2024 +0100

    Tweak bean names and allow non defaults
---
 .../admin/webauthn-management/webauthn-management-beans.xml    |  4 ++--
 .../webauthn-registration/webauthn-registration-beans.xml      | 10 +++++-----
 .../idp/flows/authn/WebAuthn/webauthn-abstract-beans.xml       |  2 +-
 .../net/shibboleth/idp/flows/authn/WebAuthn/webauthn-beans.xml |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-management/webauthn-management-beans.xml b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-management/webauthn-management-beans.xml
index b8c70ba..b6f7ba3 100644
--- a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-management/webauthn-management-beans.xml
+++ b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-management/webauthn-management-beans.xml
@@ -37,8 +37,8 @@
     <!-- Abstract parent beans -->
 
     <bean id="AbstractWebAuthnManagementAction" 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.CredentialRepositoryy') ?: 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 a2e6e03..3a3c841 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
@@ -21,8 +21,8 @@
     <!-- Abstract parent beans -->    
           
     <bean id="AbstractWebAuthnRegistrationAction" 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.CredentialRepositoryy') ?: getObject('shibboleth.authn.webauthn.DefaultCredentialRepository')}"
         p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.webauthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
   
     
@@ -53,7 +53,7 @@
         class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.PopulateWebAuthnRegistrationContext"
         p:usernameRequired="true"
         p:removeExistingRegistrationContext="true"
-        p:usernameLookupStrategy="#{getObject('%{idp.authn.webauthn.registration.usernameLookupStrategy:shibboleth.authn.webauthn.RegistrationUsernameLookupStrategy}')}">
+        p:usernameLookupStrategy="#{getObject('%{idp.authn.webauthn.registration.UsernameLookupStrategy:shibboleth.authn.webauthn.RegistrationUsernameLookupStrategy}')}">
     </bean>
         
     <!-- Default username comes from the subject context. -->
@@ -158,10 +158,10 @@
     
     
     <bean id="RegistrationOperationPopulateAuditContext" parent="shibboleth.admin.AbstractPopulateAuditContext"
-        p:fieldExtractors="#{getObject('shibboleth.authn.webauthn.registration.audit.AuditExtractors') ?: getObject('shibboleth.authn.webauthn.registration.DefaultAuditExtractors')}"
+        p:fieldExtractors="#{getObject('shibboleth.authn.webauthn.registration.audit.AuditExtractors') ?: getObject('shibboleth.authn.webauthn.registration.audit.DefaultAuditExtractors')}"
         p:clearAuditContext="true"/>
         
-     <bean id="shibboleth.authn.webauthn.registration.DefaultAuditExtractors" parent="shibboleth.admin.DefaultAuditExtractors" 
+     <bean id="shibboleth.authn.webauthn.registration.audit.DefaultAuditExtractors" parent="shibboleth.admin.DefaultAuditExtractors" 
         lazy-init="true" class="org.springframework.beans.factory.config.MapFactoryBean">
         <property name="sourceMap">
              <map merge="true">  
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 2980666..f68b950 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
@@ -63,7 +63,7 @@
         p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
         p:includeProfileLoggingId="false"
         p:httpServletRequestSupplier-ref="shibboleth.HttpServletRequestSupplier" 
-        p:activationCondition="%{idp.authn.audit.enabled:false}"
+        p:activationCondition="true"
         p:auditContextLookupStrategy-ref="AdminAuditContextLookup"/>
         
      <!-- Private copy of AuditContext for admin flows. TODO this is the default, is there somewhere better to put it?-->    
diff --git a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthn/webauthn-beans.xml b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthn/webauthn-beans.xml
index 1ca58dd..b9beb9d 100644
--- a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthn/webauthn-beans.xml
+++ b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthn/webauthn-beans.xml
@@ -17,7 +17,7 @@
     <!-- Abstract parent beans -->
     
     <bean id="AbstractWebAuthnAuthenticationAction" scope="prototype" abstract="true"
-        p:webAuthnClient="#{getObject('shibboleth.authn.webauthn.DefaultWebAuthnAuthenticationClientFactory')}"/>
+        p:webAuthnClient="#{getObject('shibboleth.authn.webauthn.WebAuthnAuthenticationClientFactory') ?: getObject('shibboleth.authn.webauthn.DefaultWebAuthnAuthenticationClientFactory')}"/>
 
     <!-- Flow beans -->
     
@@ -116,14 +116,14 @@
         
     <bean id="LookupRegisteredCredentialsFromUserHandle" scope="prototype" parent="AbstractWebAuthnAuthenticationAction"
         class="net.shibboleth.idp.plugin.authn.webauthn.impl.LookupRegisteredCredentialsFromUserHandle"
-        p:credentialRepository-ref="shibboleth.authn.webauthn.DefaultCredentialRepository"
+        p:credentialRepository="#{getObject('shibboleth.authn.webauthn.CredentialRepositoryy') ?: getObject('shibboleth.authn.webauthn.DefaultCredentialRepository')}"
         p:triggerEventOnNoCredentials="%{idp.authn.webauthn.signalEventOnNoCredentialsRegisteredForUserHandle:false}"
         p:noCredentialsEventId="%{idp.authn.webauthn.userHandleNoRegisteredCredentialsEventId:NoCredentialsRegisteredForUserHandle}"/>        
 
     <bean id="ValidateWebAuthnAssertion" scope="prototype"
         class="net.shibboleth.idp.plugin.authn.webauthn.impl.ValidateWebAuthnAssertion"
-        p:webAuthnClient="#{getObject('shibboleth.authn.webauthn.DefaultWebAuthnAuthenticationClientFactory')}" 
-        p:credentialRepository-ref="shibboleth.authn.webauthn.DefaultCredentialRepository"
+        p:webAuthnClient="#{getObject('shibboleth.authn.webauthn.WebAuthnAuthenticationClientFactory') ?: getObject('shibboleth.authn.webauthn.DefaultWebAuthnAuthenticationClientFactory')}" 
+        p:credentialRepository="#{getObject('shibboleth.authn.webauthn.CredentialRepositoryy') ?: getObject('shibboleth.authn.webauthn.DefaultCredentialRepository')}"
         p:updateSignatureCountPredicate="#{getObject('shibboleth.authn.webauthn.UpdateSignatureCountPredicate') ?: %{idp.authn.webauthn.updateSignatureCount:true}}"
         p:populateAuditContextAction="#{%{idp.authn.webauthn.audit.enabled:%{idp.authn.audit.enabled:false}} ? getObject('shibboleth.authn.webauthn.PopulateAuditContext') : null}"
         p:writeAuditLogAction="#{%{idp.authn.webauthn.audit.enabled:%{idp.authn.audit.enabled:false}} ? getObject('WriteAuthnAuditLog') : null}"/>

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