[java-idp-plugin-webauthn] branch main updated: Add Spring bean parent to Inspector rule

[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=e04091ae1b115180769d88319b0568f34611759f

The following commit(s) were added to refs/heads/main by this push:
     new e04091a  Add Spring bean parent to Inspector rule
e04091a is described below

commit e04091ae1b115180769d88319b0568f34611759f
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Oct 21 17:06:34 2024 +0100

    Add Spring bean parent to Inspector rule
---
 .../admin/webauthn-registration/webauthn-registration-beans.xml  | 9 ++++++---
 .../net/shibboleth/idp/flows/authn/WebAuthn/webauthn-beans.xml   | 2 +-
 .../idp/plugin/authn/webauthn/conf/authn/webauthn-config.xml     | 2 +-
 .../authn/webauthn/conf/authn/webauthn-registration-config.xml   | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

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 0990eba..1a8be50 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
@@ -34,15 +34,18 @@
         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')}"/>
   
-    <bean id="AbstractAuthenticatorPolicyRule" scope="prototype" abstract="true"
+    <bean id="shibboleth.authn.WebAuthn.registration.AbstractAuthenticatorPolicyRule" scope="prototype" abstract="true"
         p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
     
+    <bean id="shibboleth.authn.WebAuthn.registration.AbstractAuthenticatorCapabilitiesInspector" scope="prototype" abstract="true"
+        p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
+     
     <bean id="shibboleth.authn.WebAuthn.registration.FunctionalAuthenticatorPolicyRule" abstract="true"
-        class=" net.shibboleth.idp.plugin.authn.webauthn.admin.policy.impl.FunctionalAuthenticatorPolicyRule" 
+        class="net.shibboleth.idp.plugin.authn.webauthn.admin.policy.impl.FunctionalAuthenticatorPolicyRule" 
         p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
         
     <bean id="shibboleth.authn.WebAuthn.registration.FunctionalAuthenticatorInspectorRule" abstract="true"
-        class=" net.shibboleth.idp.plugin.authn.webauthn.admin.policy.impl.FunctionalAuthenticatorInspectorRule" 
+        class="net.shibboleth.idp.plugin.authn.webauthn.admin.policy.impl.FunctionalAuthenticatorInspectorRule" 
         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/authn/WebAuthn/webauthn-beans.xml b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthn/webauthn-beans.xml
index 72202e6..668cba4 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
@@ -19,7 +19,7 @@
     <bean id="AbstractWebAuthnAuthenticationAction" scope="prototype" abstract="true"
         p:webAuthnClient="#{getObject('shibboleth.authn.WebAuthn.WebAuthnAuthenticationClientFactory') ?: getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnAuthenticationClientFactory')}"/>
         
-    <bean id="AbstractCredentialPolicyRule" scope="prototype" abstract="true"
+    <bean id="shibboleth.authn.WebAuthn.AbstractCredentialPolicyRule" scope="prototype" abstract="true"
         p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
 
     <bean id="shibboleth.authn.WebAuthn.FunctionalCredentialPolicyRule" abstract="true" scope="prototype"
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-config.xml b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-config.xml
index a3ab112..48e1dc0 100644
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-config.xml
+++ b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-config.xml
@@ -15,7 +15,7 @@
     
     -->
     <util:list id="shibboleth.authn.WebAuthn.ChainedCredentialPolicyList">
-        <bean id="SecondFactorOnlyCredentialPolicyRule" parent="AbstractCredentialPolicyRule"
+        <bean id="SecondFactorOnlyCredentialPolicyRule" parent="shibboleth.authn.WebAuthn.AbstractCredentialPolicyRule"
                 class="net.shibboleth.idp.plugin.authn.webauthn.policy.impl.SecondFactorOnlyCredentialPolicyRule"/>
     </util:list>
 
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-registration-config.xml b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-registration-config.xml
index d11768a..9202e2c 100644
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-registration-config.xml
+++ b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-registration-config.xml
@@ -14,7 +14,7 @@
     idp.authn.webauthn.registration.authenticator.policy.enabled must be set to true for these to take effect.
     -->
     <util:list id="shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorPolicyList">  
-        <bean id="AllowlistAuthenticatorPolicy" parent="AbstractAuthenticatorPolicyRule" 
+        <bean id="AllowlistAuthenticatorPolicy" parent="shibboleth.authn.WebAuthn.registration.AbstractAuthenticatorPolicyRule" 
             class="net.shibboleth.idp.plugin.authn.webauthn.admin.policy.impl.AllowlistAuthenticatorPolicy"
             p:allowedAuthenticators="%{idp.authn.webauthn.registration.authenticator.policy.allowedAuthenticators:null}"/>
     </util:list>    
@@ -24,7 +24,7 @@
     idp.authn.webauthn.registration.authenticator.inspector.enabled must be set to true for these to take effect.
     -->
     <util:list id="shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorInspectorList">  
-        <bean id="SecondFactorOnlyInspector"
+        <bean id="SecondFactorOnlyInspector" parent="shibboleth.authn.WebAuthn.registration.AbstractAuthenticatorCapabilitiesInspector"
             class="net.shibboleth.idp.plugin.authn.webauthn.admin.policy.impl.SecondFactorOnlyAuthenticatorInspector"
             p:secondFactorOnlyAuthenticators="%{idp.authn.webauthn.registration.authenticator.inspector.secondFactorOnlyAuthenticators:null}"/>
     </util:list>

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