[java-idp-plugin-webauthn] branch main updated: Harmonize bean IDs
Phil Smart
philip.smart at jisc.ac.uk
Mon Oct 21 15:41:29 UTC 2024
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=4602ee2531e927b59db50e85d1f5bfa37b1e398f
The following commit(s) were added to refs/heads/main by this push:
new 4602ee2 Harmonize bean IDs
4602ee2 is described below
commit 4602ee2531e927b59db50e85d1f5bfa37b1e398f
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Oct 21 16:41:26 2024 +0100
Harmonize bean IDs
---
.../META-INF/net.shibboleth.idp/postconfig.xml | 16 +++---
.../webauthn-management-beans.xml | 10 ++--
.../webauthn-registration-beans.xml | 58 +++++++++++-----------
.../authn/WebAuthn/webauthn-abstract-beans.xml | 8 +--
.../idp/flows/authn/WebAuthn/webauthn-beans.xml | 46 ++++++++---------
.../authn/webauthn/conf/authn/webauthn-config.xml | 2 +-
.../conf/authn/webauthn-registration-config.xml | 6 +--
.../conf/authn/webauthn-registration.properties | 14 +++---
.../authn/webauthn/conf/authn/webauthn.properties | 6 +--
.../webauthn/flow/AbstractWebAuthnFlowTest.java | 2 +-
.../authn/webauthn/test-beans-authentication.xml | 4 +-
.../authn/webauthn/test-beans-registration.xml | 14 +++---
12 files changed, 93 insertions(+), 93 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 33eb81a..05445d1 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
@@ -82,7 +82,7 @@
<!-- Singleton clients and repositories -->
<!-- TODO configure these with getbeans and properties -->
- <bean id="shibboleth.authn.webauthn.DefaultWebAuthnAuthenticationClientFactory" scope="singleton"
+ <bean id="shibboleth.authn.WebAuthn.DefaultWebAuthnAuthenticationClientFactory" scope="singleton"
class="net.shibboleth.idp.plugin.authn.webauthn.client.impl.YubicoWebauthnClientFactory"
p:relyingPartyId="%{idp.authn.webauthn.relyingPartyId}"
p:relyingPartyName="%{idp.authn.webauthn.relyingPartyName}"
@@ -91,20 +91,20 @@
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:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.webauthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
+ p:credentialRepository-ref="shibboleth.authn.WebAuthn.DefaultCredentialRepository"
+ p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
- <bean id="shibboleth.authn.webauthn.DefaultCredentialRepository" scope="singleton"
+ <bean id="shibboleth.authn.WebAuthn.DefaultCredentialRepository" scope="singleton"
class="net.shibboleth.idp.plugin.authn.webauthn.storage.impl.IdPStorageServiceCredentialRespository"
p:storageService-ref="#{'%{idp.authn.webauthn.StorageService:shibboleth.StorageService}'.trim()}"
- p:serializer-ref="shibboleth.authn.webauthn.DefaultCredentialRepositoryStorageSerializer"/>
+ p:serializer-ref="shibboleth.authn.WebAuthn.DefaultCredentialRepositoryStorageSerializer"/>
- <bean id="shibboleth.authn.webauthn.DefaultCredentialRepositoryStorageSerializer"
+ <bean id="shibboleth.authn.WebAuthn.DefaultCredentialRepositoryStorageSerializer"
class="net.shibboleth.idp.plugin.authn.webauthn.storage.impl.CredentialRegistrationSerializer"/>
<!-- The optional FIDO Metadata service. Lazy-init, only constructed if used. -->
- <bean id="shibboleth.authn.webauthn.DefaultWebAuthnFidoMetadataServiceFactory"
+ <bean id="shibboleth.authn.WebAuthn.DefaultWebAuthnFidoMetadataServiceFactory"
class="net.shibboleth.idp.plugin.authn.webauthn.metadata.impl.FidoMetadataServiceFactory" scope="singleton"
lazy-init="true"
p:trustRootFile="%{idp.authn.webauthn.metadata.trustRootFile:}"
@@ -115,7 +115,7 @@
p:expectedLegalHeaders="%{idp.authn.webauthn.metadata.expectedLegalHeaders:Retrieval and use of this BLOB indicates acceptance of the appropriate agreement located at https://fidoalliance.org/metadata/metadata-legal-terms/}"/>
<!-- The optional supplementry FIDO passkey metadata service. Lazy-init, only constructed if used. -->
- <bean id="shibboleth.authn.webauthn.DefaultPasskeyAaguidMetadataServiceFactory"
+ <bean id="shibboleth.authn.WebAuthn.DefaultPasskeyAaguidMetadataServiceFactory"
class="net.shibboleth.idp.plugin.authn.webauthn.metadata.impl.PasskeyAaguidMetadataFactory" scope="singleton"
lazy-init="true"
p:passkeyAaguidFile="%{idp.authn.webauthn.metadata.aaguid.passkeyAaguidFile:}"/>
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 08dea52..891e252 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,9 +37,9 @@
<!-- Abstract parent beans -->
<bean id="AbstractWebAuthnManagementAction" scope="prototype" abstract="true"
- 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')}"/>
+ 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')}"/>
<!-- Flow beans -->
@@ -106,10 +106,10 @@
</util:map>
<bean id="PostAdminFunctionPopulateAuditContext" parent="shibboleth.admin.AbstractPopulateAuditContext"
- p:fieldExtractors="#{getObject('shibboleth.authn.webauthn.admin.management.audit.AuditExtractors') ?: getObject('shibboleth.authn.webauthn.admin.management.DefaultAuditExtractors')}"
+ p:fieldExtractors="#{getObject('shibboleth.authn.WebAuthn.admin.management.audit.AuditExtractors') ?: getObject('shibboleth.authn.WebAuthn.admin.management.DefaultAuditExtractors')}"
p:clearAuditContext="true"/>
- <bean id="shibboleth.authn.webauthn.admin.management.DefaultAuditExtractors" parent="shibboleth.admin.DefaultAuditExtractors"
+ <bean id="shibboleth.authn.WebAuthn.admin.management.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/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 cede9ca..0990eba 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
@@ -30,20 +30,20 @@
<!-- Abstract parent beans -->
<bean id="AbstractWebAuthnRegistrationAction" scope="prototype" abstract="true"
- 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')}"/>
+ 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')}"/>
<bean id="AbstractAuthenticatorPolicyRule" scope="prototype" abstract="true"
- p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.webauthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
+ 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"
+ <bean id="shibboleth.authn.WebAuthn.registration.FunctionalAuthenticatorPolicyRule" abstract="true"
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')}"/>
+ 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"
+ <bean id="shibboleth.authn.WebAuthn.registration.FunctionalAuthenticatorInspectorRule" abstract="true"
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')}"/>
+ p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
<!-- Flow beans -->
@@ -70,7 +70,7 @@
p:uppercase="%{idp.authn.webauthn.registration.username.uppercase:false}"
p:lowercase="%{idp.authn.webauthn.registration.username.lowercase:false}"
p:trim="%{idp.authn.webauthn.registration.username.trim:false}"
- p:transforms="#{getObject('shibboleth.authn.webauthn.registration.UsernameTransformations')}"/>
+ p:transforms="#{getObject('shibboleth.authn.WebAuthn.registration.UsernameTransformations')}"/>
<bean id="InitializeSubjectCanonicalizationContext" parent="AbstractWebAuthnBaseAction"
class="net.shibboleth.idp.plugin.authn.webauthn.impl.InitializeSubjectCanonicalizationContext" scope="prototype"
@@ -99,13 +99,13 @@
class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.PopulateWebAuthnRegistrationContext"
p:usernameRequired="true"
p:removeExistingRegistrationContext="true"
- p:usernameLookupStrategy="#{getObject('%{idp.authn.webauthn.registration.principalname.strategy:shibboleth.authn.webauthn.SubjectContextUsernameLookupStrategy}')}">
+ p:usernameLookupStrategy="#{getObject('%{idp.authn.webauthn.registration.principalname.strategy:shibboleth.authn.WebAuthn.SubjectContextUsernameLookupStrategy}')}">
</bean>
- <bean id="shibboleth.authn.webauthn.SubjectContextUsernameLookupStrategy" lazy-init="true" scope="singleton"
+ <bean id="shibboleth.authn.WebAuthn.SubjectContextUsernameLookupStrategy" lazy-init="true" scope="singleton"
class="net.shibboleth.idp.plugin.authn.webauthn.context.navigate.UsernameLookupFromSubjectContext" />
- <bean id="shibboleth.authn.webauthn.AttributeContextWebAuthnNameLookupStrategy" lazy-init="true" scope="singleton"
+ <bean id="shibboleth.authn.WebAuthn.AttributeContextWebAuthnNameLookupStrategy" lazy-init="true" scope="singleton"
class="net.shibboleth.idp.plugin.authn.webauthn.context.navigate.AttributeContextStringLookupStrategy"
p:attributeId="%{idp.authn.webauthn.registration.name.attributeId:#{null}}"/>
@@ -133,32 +133,32 @@
<bean id="GenerateServerChallenge" parent="AbstractWebAuthnBaseAction" scope="prototype"
class="net.shibboleth.idp.plugin.authn.webauthn.impl.GenerateServerChallenge"
p:webAuthnContextLookupStrategy-ref="shibboleth.ChildLookup.WebAuthnRegistrationContext"
- p:challengeGeneratorStrategy="#{getObject('shibboleth.authn.webauthn.ChallengeGeneratorStrategy')}"/>
+ p:challengeGeneratorStrategy="#{getObject('shibboleth.authn.WebAuthn.ChallengeGeneratorStrategy')}"/>
<bean id="AddUserId" parent="AbstractWebAuthnRegistrationAction" scope="prototype"
class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.AddUserId"
- p:userIdGeneratorStrategy="#{getObject('%{idp.authn.webauthn.registration.userid.strategy:shibboleth.authn.webauthn.RandomUserIdGenerator}')}"/>
+ p:userIdGeneratorStrategy="#{getObject('%{idp.authn.webauthn.registration.userid.strategy:shibboleth.authn.WebAuthn.RandomUserIdGenerator}')}"/>
<bean id="AddUserName" parent="AbstractWebAuthnRegistrationAction" scope="prototype"
class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.AddUserName"
- p:userNameLookupStrategy="#{getObject('%{idp.authn.webauthn.registration.name.strategy:shibboleth.authn.webauthn.SubjectContextUsernameLookupStrategy}')}"/>
+ p:userNameLookupStrategy="#{getObject('%{idp.authn.webauthn.registration.name.strategy:shibboleth.authn.WebAuthn.SubjectContextUsernameLookupStrategy}')}"/>
<bean id="AddDisplayName" parent="AbstractWebAuthnRegistrationAction" scope="prototype"
class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.AddDisplayName"
- p:displayNameLookupStrategy="#{getObject('%{idp.authn.webauthn.registration.displayname.strategy:shibboleth.authn.webauthn.SubjectContextDisplayNameLookupStrategy}')}"/>
+ p:displayNameLookupStrategy="#{getObject('%{idp.authn.webauthn.registration.displayname.strategy:shibboleth.authn.WebAuthn.SubjectContextDisplayNameLookupStrategy}')}"/>
- <bean id="shibboleth.authn.webauthn.SubjectContextDisplayNameLookupStrategy" lazy-init="true"
+ <bean id="shibboleth.authn.WebAuthn.SubjectContextDisplayNameLookupStrategy" lazy-init="true"
class="net.shibboleth.idp.plugin.authn.webauthn.context.navigate.UsernameLookupFromSubjectContext"/>
- <bean id="shibboleth.authn.webauthn.AttributeContextDisplayNameLookupStrategy" lazy-init="true" scope="singleton"
+ <bean id="shibboleth.authn.WebAuthn.AttributeContextDisplayNameLookupStrategy" lazy-init="true" scope="singleton"
class="net.shibboleth.idp.plugin.authn.webauthn.context.navigate.AttributeContextStringLookupStrategy"
p:attributeId="%{idp.authn.webauthn.registration.displayname.attributeId:#{null}}"/>
- <bean id="shibboleth.authn.webauthn.AttributeContextUserIdLookupStrategy" scope="singleton" lazy-init="true"
+ <bean id="shibboleth.authn.WebAuthn.AttributeContextUserIdLookupStrategy" scope="singleton" lazy-init="true"
class="net.shibboleth.idp.plugin.authn.webauthn.context.navigate.AttributeContextByteArrayLookupStrategy"
p:attributeId="%{idp.authn.webauthn.registration.userid.attributeId:#{null}}"/>
- <bean id="shibboleth.authn.webauthn.RandomUserIdGenerator" scope="singleton" lazy-init="true"
+ <bean id="shibboleth.authn.WebAuthn.RandomUserIdGenerator" scope="singleton" lazy-init="true"
class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.RandomUserIdGenerator"/>
<bean id="CreatePublicKeyCredentialCreationOptions" parent="AbstractWebAuthnRegistrationAction" scope="prototype"
@@ -184,28 +184,28 @@
<bean id="CheckAuthenticatorPolicy" parent="AbstractWebAuthnRegistrationAction" scope="prototype"
class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.CheckAuthenticatorPolicy"
- p:authenticatorPolicy="#{getObject('%{idp.authn.webauthn.registration.authenticator.policy:shibboleth.authn.webauthn.registration.ChainedAuthenticatorPolicy}')}"
+ p:authenticatorPolicy="#{getObject('%{idp.authn.webauthn.registration.authenticator.policy:shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorPolicy}')}"
p:activationCondition="%{idp.authn.webauthn.registration.authenticator.policy.enabled:false}"/>
- <bean id="shibboleth.authn.webauthn.registration.ChainedAuthenticatorPolicy" scope="prototype"
+ <bean id="shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorPolicy" scope="prototype"
class="net.shibboleth.idp.plugin.authn.webauthn.admin.policy.impl.ChainingAuthenticatorPolicyRule"
- p:authenticatorPolicyChain="#{getObject('%{idp.authn.webauthn.registration.authenticator.policy.chainedlist:shibboleth.authn.webauthn.registration.ChainedAuthenticatorPolicyList}')}"/>
+ p:authenticatorPolicyChain="#{getObject('%{idp.authn.webauthn.registration.authenticator.policy.chainedlist:shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorPolicyList}')}"/>
<bean id="AttachAuthenticatorCapabilities" parent="AbstractWebAuthnRegistrationAction" scope="prototype"
class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.AttachAuthenticatorCapabilities"
- p:authenticatorInspector="#{getObject('%{idp.authn.webauthn.registration.authenticator.inspector:shibboleth.authn.webauthn.registration.ChainedAuthenticatorCapabilitiesInspector}')}"
+ p:authenticatorInspector="#{getObject('%{idp.authn.webauthn.registration.authenticator.inspector:shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorCapabilitiesInspector}')}"
p:activationCondition="%{idp.authn.webauthn.registration.authenticator.inspector.enabled:false}"/>
- <bean id="shibboleth.authn.webauthn.registration.ChainedAuthenticatorCapabilitiesInspector" scope="prototype"
+ <bean id="shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorCapabilitiesInspector" scope="prototype"
class="net.shibboleth.idp.plugin.authn.webauthn.admin.policy.impl.ChainingAuthenticatorCapabilitiesInspector"
- p:authenticatorInspectorChain="#{getObject('%{idp.authn.webauthn.registration.authenticator.inspector.chainedlist:shibboleth.authn.webauthn.registration.ChainedAuthenticatorInspectorList}')}"/>
+ p:authenticatorInspectorChain="#{getObject('%{idp.authn.webauthn.registration.authenticator.inspector.chainedlist:shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorInspectorList}')}"/>
<bean id="ValidateAuthenticatorAttestationResponse" parent="AbstractWebAuthnRegistrationAction"
class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.ValidateAuthenticatorAttestationResponse" />
<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-ref="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" />
@@ -230,10 +230,10 @@
<bean id="RegistrationOperationPopulateAuditContext" parent="shibboleth.admin.AbstractPopulateAuditContext"
- p:fieldExtractors="#{getObject('shibboleth.authn.webauthn.registration.audit.AuditExtractors') ?: getObject('shibboleth.authn.webauthn.registration.audit.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.audit.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 ad48c80..98b70ba 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,10 +29,10 @@
<!-- 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: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')}"/>
+ p:webAuthnClient="#{getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnAuthenticationClientFactory')}"
+ p: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')}"/>
<!-- Used in views to calculate CSP hashes and nonces, remove and adjust beans in flow when compatibility bumped past 5.0 -->
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 f51834f..72202e6 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,14 +17,14 @@
<!-- Abstract parent beans -->
<bean id="AbstractWebAuthnAuthenticationAction" scope="prototype" abstract="true"
- p:webAuthnClient="#{getObject('shibboleth.authn.webauthn.WebAuthnAuthenticationClientFactory') ?: getObject('shibboleth.authn.webauthn.DefaultWebAuthnAuthenticationClientFactory')}"/>
+ p:webAuthnClient="#{getObject('shibboleth.authn.WebAuthn.WebAuthnAuthenticationClientFactory') ?: getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnAuthenticationClientFactory')}"/>
<bean id="AbstractCredentialPolicyRule" scope="prototype" abstract="true"
- p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.webauthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
+ 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"
+ <bean id="shibboleth.authn.WebAuthn.FunctionalCredentialPolicyRule" abstract="true" scope="prototype"
class=" net.shibboleth.idp.plugin.authn.webauthn.policy.impl.FunctionalCredentialPolicyRule"
- p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.webauthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
+ p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
<!-- Flow beans -->
@@ -53,14 +53,14 @@
<bean id="PopulateWebAuthnAuthenticationContextFor2FA" scope="prototype"
class="net.shibboleth.idp.plugin.authn.webauthn.impl.PopulateWebAuthnAuthenticationContext"
p:usernameRequired="true"
- p:usernameLookupStrategy="#{getObject('%{idp.authn.webauthn.2fa.username.strategy:shibboleth.authn.webauthn.CanonicalUsernameLookupStrategy}')}">
+ p:usernameLookupStrategy="#{getObject('%{idp.authn.webauthn.2fa.username.strategy:shibboleth.authn.WebAuthn.CanonicalUsernameLookupStrategy}')}">
<property name="contextUpdateConsumer">
<bean id="setUsernamelessConsumer" scope="prototype"
class="net.shibboleth.idp.plugin.authn.webauthn.impl.SetSecondFactorUsageToContextConsumer"/>
</property>
</bean>
- <bean id="shibboleth.authn.webauthn.CanonicalUsernameLookupStrategy" lazy-init="true" scope="singleton"
+ <bean id="shibboleth.authn.WebAuthn.CanonicalUsernameLookupStrategy" lazy-init="true" scope="singleton"
class="net.shibboleth.idp.session.context.navigate.CanonicalUsernameLookupStrategy" />
<bean id="IsUsernameCollectionRequired" scope="prototype"
@@ -68,9 +68,9 @@
<bean id="IsSecondFactor" scope="prototype"
class="net.shibboleth.idp.plugin.authn.webauthn.context.logic.IsSecondFactor"
- p:usernameLookupStrategy="#{getObject('%{idp.authn.webauthn.2fa.username.strategy:shibboleth.authn.webauthn.CanonicalUsernameLookupStrategy}')}"
- p:secondFactorOverride="#{getObject('shibboleth.authn.webauthn.SecondFactorOverride') != null ?
- getObject('shibboleth.authn.webauthn.SecondFactorOverride') : %{idp.authn.webauthn.2fa.forceSecondFactorFlow:false}}"
+ p:usernameLookupStrategy="#{getObject('%{idp.authn.webauthn.2fa.username.strategy:shibboleth.authn.WebAuthn.CanonicalUsernameLookupStrategy}')}"
+ p:secondFactorOverride="#{getObject('shibboleth.authn.WebAuthn.SecondFactorOverride') != null ?
+ getObject('shibboleth.authn.WebAuthn.SecondFactorOverride') : %{idp.authn.webauthn.2fa.forceSecondFactorFlow:false}}"
p:allowedPreviousFactors="%{idp.authn.webauthn.2fa.allowedPreviousFactors:authn/Password}"
p:enabled="%{idp.authn.webauthn.2fa.enabled:false}"/>
@@ -92,7 +92,7 @@
p:uppercase="%{idp.authn.webauthn.passwordless.username.uppercase:false}"
p:lowercase="%{idp.authn.webauthn.passwordless.username.lowercase:false}"
p:trim="%{idp.authn.webauthn.passwordless.username.trim:false}"
- p:transforms="#{getObject('shibboleth.authn.webauthn.passwordless.UsernameTransformations')}"/>
+ p:transforms="#{getObject('shibboleth.authn.WebAuthn.passwordless.UsernameTransformations')}"/>
<bean id="InitializeSubjectCanonicalizationContext" parent="AbstractWebAuthnBaseAction"
class="net.shibboleth.idp.plugin.authn.webauthn.impl.InitializeSubjectCanonicalizationContext" scope="prototype"
@@ -128,7 +128,7 @@
<bean id="GenerateServerChallenge" scope="prototype" parent="AbstractWebAuthnBaseAction"
class="net.shibboleth.idp.plugin.authn.webauthn.impl.GenerateServerChallenge"
p:webAuthnContextLookupStrategy-ref="shibboleth.ChildLookup.WebAuthnAuthenticationContextFromAuthenticationContext"
- p:challengeGeneratorStrategy="#{getObject('shibboleth.authn.webauthn.ChallengeGeneratorStrategy')}"/>
+ p:challengeGeneratorStrategy="#{getObject('shibboleth.authn.WebAuthn.ChallengeGeneratorStrategy')}"/>
<bean id="CreatePublicKeyCredentialRequestOptions" scope="prototype" parent="AbstractWebAuthnAuthenticationAction"
class="net.shibboleth.idp.plugin.authn.webauthn.impl.CreatePublicKeyCredentialRequestOptions"/>
@@ -140,26 +140,26 @@
<bean id="LookupRegisteredCredentialsFromUserHandle" scope="prototype" parent="AbstractWebAuthnAuthenticationAction"
class="net.shibboleth.idp.plugin.authn.webauthn.impl.LookupRegisteredCredentialsFromUserHandle"
- p:credentialRepository="#{getObject('shibboleth.authn.webauthn.CredentialRepositoryy') ?: getObject('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="CheckCredentialPolicy" parent="AbstractWebAuthnAuthenticationAction" scope="prototype"
class="net.shibboleth.idp.plugin.authn.webauthn.impl.CheckCredentialPolicy"
- p:credentialRepository="#{getObject('shibboleth.authn.webauthn.CredentialRepositoryy') ?: getObject('shibboleth.authn.webauthn.DefaultCredentialRepository')}"
- p:credentialPolicy="#{getObject('%{idp.authn.webauthn.credential.policy:shibboleth.authn.webauthn.ChainedCredentialPolicy}')}"
+ p:credentialRepository="#{getObject('shibboleth.authn.WebAuthn.CredentialRepositoryy') ?: getObject('shibboleth.authn.WebAuthn.DefaultCredentialRepository')}"
+ p:credentialPolicy="#{getObject('%{idp.authn.webauthn.credential.policy:shibboleth.authn.WebAuthn.ChainedCredentialPolicy}')}"
p:activationCondition="%{idp.authn.webauthn.credential.policy.enabled:false}"/>
- <bean id="shibboleth.authn.webauthn.ChainedCredentialPolicy" scope="prototype"
+ <bean id="shibboleth.authn.WebAuthn.ChainedCredentialPolicy" scope="prototype"
class="net.shibboleth.idp.plugin.authn.webauthn.policy.impl.ChainingCredentialPolicyRule"
- p:credentialPolicyChain="#{getObject('%{idp.authn.webauthn.credential.policy.chainedlist:shibboleth.authn.webauthn.ChainedCredentialPolicyList}')}"/>
+ p:credentialPolicyChain="#{getObject('%{idp.authn.webauthn.credential.policy.chainedlist:shibboleth.authn.WebAuthn.ChainedCredentialPolicyList}')}"/>
<bean id="ValidateWebAuthnAssertion" scope="prototype"
class="net.shibboleth.idp.plugin.authn.webauthn.impl.ValidateWebAuthnAssertion"
- 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: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:webAuthnClient="#{getObject('shibboleth.authn.WebAuthn.WebAuthnAuthenticationClientFactory') ?: getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnAuthenticationClientFactory')}"
+ p:credentialRepository="#{getObject('shibboleth.authn.WebAuthn.CredentialRepository') ?: 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}"/>
<!-- Error beans -->
@@ -176,11 +176,11 @@
value="#{'%{idp.authn.webauthn.audit.format:%a|%T|%SP|%I|%s|%AF|%CV|%u|%WebAuthnUID|%WebAuthnUV|%WebAuthnFM|%tu|%AR|%UA}'.trim()}" />
</util:map>
- <bean id="shibboleth.authn.webauthn.PopulateAuditContext" parent="shibboleth.authn.AbstractPopulateAuditContext" lazy-init="true"
- p:fieldExtractors="#{getObject('shibboleth.authn.webauthn.AuditExtractors') ?: getObject('shibboleth.authn.webauthn.DefaultAuditExtractors')}"
+ <bean id="shibboleth.authn.WebAuthn.PopulateAuditContext" parent="shibboleth.authn.AbstractPopulateAuditContext" lazy-init="true"
+ p:fieldExtractors="#{getObject('shibboleth.authn.WebAuthn.AuditExtractors') ?: getObject('shibboleth.authn.WebAuthn.DefaultAuditExtractors')}"
p:clearAuditContext="true" />
- <bean id="shibboleth.authn.webauthn.DefaultAuditExtractors" parent="shibboleth.authn.DefaultAuditExtractors" lazy-init="true"
+ <bean id="shibboleth.authn.WebAuthn.DefaultAuditExtractors" parent="shibboleth.authn.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/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 868c674..a3ab112 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
@@ -14,7 +14,7 @@
idp.authn.webauthn.credential.policy.enabled must be set to true for these to take effect.
-->
- <util:list id="shibboleth.authn.webauthn.ChainedCredentialPolicyList">
+ <util:list id="shibboleth.authn.WebAuthn.ChainedCredentialPolicyList">
<bean id="SecondFactorOnlyCredentialPolicyRule" parent="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 0dabaeb..d11768a 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
@@ -13,7 +13,7 @@
The default list to add authenticator policies used during registration. The property
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">
+ <util:list id="shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorPolicyList">
<bean id="AllowlistAuthenticatorPolicy" parent="AbstractAuthenticatorPolicyRule"
class="net.shibboleth.idp.plugin.authn.webauthn.admin.policy.impl.AllowlistAuthenticatorPolicy"
p:allowedAuthenticators="%{idp.authn.webauthn.registration.authenticator.policy.allowedAuthenticators:null}"/>
@@ -23,8 +23,8 @@
The default list to add authenticator inspectors used during registration. The property
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="shibboleth.authn.webauthn.registration.SecondFactorOnlyInspector"
+ <util:list id="shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorInspectorList">
+ <bean id="SecondFactorOnlyInspector"
class="net.shibboleth.idp.plugin.authn.webauthn.admin.policy.impl.SecondFactorOnlyAuthenticatorInspector"
p:secondFactorOnlyAuthenticators="%{idp.authn.webauthn.registration.authenticator.inspector.secondFactorOnlyAuthenticators:null}"/>
</util:list>
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-registration.properties b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-registration.properties
index c715af0..905a70b 100644
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-registration.properties
+++ b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-registration.properties
@@ -19,17 +19,17 @@
# Resolve attributes from the attribute resolver to be used as part of a user's identity
#idp.authn.webauthn.admin.registration.resolveAttributes = true
# The bean name of the WebAuthn user.name lookup strategy.
-#idp.authn.webauthn.registration.name.strategy = shibboleth.authn.webauthn.SubjectContextUsernameLookupStrategy
+#idp.authn.webauthn.registration.name.strategy = shibboleth.authn.WebAuthn.SubjectContextUsernameLookupStrategy
# If using the attribute context lookup strategy, which attribute should the user.name be taken from
#idp.authn.webauthn.registration.name.attributeId = WebAuthnUsername
# The bean name of the user.id generator or lookup strategy
-#idp.authn.webauthn.registration.userid.strategy = shibboleth.authn.webauthn.RandomUserIdGenerator
+#idp.authn.webauthn.registration.userid.strategy = shibboleth.authn.WebAuthn.RandomUserIdGenerator
# If using the attribute context lookup strategy, which attribute should the user.id be taken from
#idp.authn.webauthn.registration.userid.attributeId = WebAuthnUserID
# The bean name of the user.displayName lookup strategy
-#idp.authn.webauthn.registration.displayname.strategy = shibboleth.authn.webauthn.SubjectContextDisplayNameLookupStrategy
+#idp.authn.webauthn.registration.displayname.strategy = shibboleth.authn.WebAuthn.SubjectContextDisplayNameLookupStrategy
# If using the attribute context lookup strategy, which attribute should the user.displayName be taken from
#idp.authn.webauthn.registration.displayname.attributeId = mail
@@ -51,18 +51,18 @@
# Enable the authenticator policy engine?
#idp.authn.webauthn.registration.authenticator.policy.enabled = false
# Set the authenticator policy to use, defaults to a chained set of policies
-#idp.authn.webauthn.registration.authenticator.policy = shibboleth.authn.webauthn.registration.ChainedAuthenticatorPolicy
+#idp.authn.webauthn.registration.authenticator.policy = shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorPolicy
# When using the chained policy; name the policy list bean
-#idp.authn.webauthn.registration.authenticator.policy.chainedlist = shibboleth.authn.webauthn.ChainedCredentialPolicyList
+#idp.authn.webauthn.registration.authenticator.policy.chainedlist = shibboleth.authn.WebAuthn.ChainedCredentialPolicyList
# When using the default chained policy; list allowed authenticator's by their attestation GUIDs (AAGUID)
#idp.authn.webauthn.registration.authenticator.policy.allowedAuthenticators =
# Enable the authenticator inspector engine?
#idp.authn.webauthn.registration.authenticator.inspector.enabled = false
# Set the authenticator inspectors to use, defaults to a chained set of inspectors
-#idp.authn.webauthn.registration.authenticator.inspector = shibboleth.authn.webauthn.registration.ChainedAuthenticatorCapabilitiesInspector
+#idp.authn.webauthn.registration.authenticator.inspector = shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorCapabilitiesInspector
# When using the default chained inspector; name the inspector list bean
-#idp.authn.webauthn.registration.authenticator.inspector.chainedlist = shibboleth.authn.webauthn.registration.ChainedAuthenticatorInspectors
+#idp.authn.webauthn.registration.authenticator.inspector.chainedlist = shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorInspectors
# When using the default chained set of inspectors; list authenticators (by attestation GUIDs (AAGUID)) to tag as only allowed for second factor authentication
#idp.authn.webauthn.registration.authenticator.inspector.secondFactorOnlyAuthenticators =
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn.properties b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn.properties
index de00cca..b9ed6db 100644
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn.properties
+++ b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn.properties
@@ -42,7 +42,7 @@ idp.authn.webauthn.supportedPrincipals = \
#idp.authn.webauthn.2fa.forceSecondFactorFlow = false
# The bean name of the username lookup strategy. By default, this comes from the principal name established by the first factor.
-#idp.authn.webauthn.2fa.username.strategy = shibboleth.authn.webauthn.CanonicalUsernameLookupStrategy
+#idp.authn.webauthn.2fa.username.strategy = shibboleth.authn.WebAuthn.CanonicalUsernameLookupStrategy
# Should we update an authenticators signature counter inside the credential repository after each successful authentication?
#idp.authn.webauthn.updateSignatureCount = true
@@ -67,9 +67,9 @@ idp.authn.webauthn.supportedPrincipals = \
# Enable the credential policy engine
#idp.authn.webauthn.credential.policy.enabled = false
# Set the credential policies to use, defaults to a chained set of policies
-#idp.authn.webauthn.credential.policy = shibboleth.authn.webauthn.ChainedCredentialPolicy
+#idp.authn.webauthn.credential.policy = shibboleth.authn.WebAuthn.ChainedCredentialPolicy
# When using the default chained policy, which policy list should we use?
-#idp.authn.webauthn.credential.policy.chainedlist = shibboleth.authn.webauthn.ChainedCredentialPolicyList
+#idp.authn.webauthn.credential.policy.chainedlist = shibboleth.authn.WebAuthn.ChainedCredentialPolicyList
# Audit
#idp.authn.webauthn.audit.enabled = false
diff --git a/webauthn-impl/src/test/java/net/shibboleth/idp/plugin/authn/webauthn/flow/AbstractWebAuthnFlowTest.java b/webauthn-impl/src/test/java/net/shibboleth/idp/plugin/authn/webauthn/flow/AbstractWebAuthnFlowTest.java
index 0f51b35..6823f11 100644
--- a/webauthn-impl/src/test/java/net/shibboleth/idp/plugin/authn/webauthn/flow/AbstractWebAuthnFlowTest.java
+++ b/webauthn-impl/src/test/java/net/shibboleth/idp/plugin/authn/webauthn/flow/AbstractWebAuthnFlowTest.java
@@ -127,7 +127,7 @@ public abstract class AbstractWebAuthnFlowTest extends AbstractFlowTest {
protected RelyingParty rp;
@Autowired
- @Qualifier("shibboleth.authn.webauthn.DefaultCredentialRepository")
+ @Qualifier("shibboleth.authn.WebAuthn.DefaultCredentialRepository")
protected IdPStorageServiceCredentialRespository credentialRepo;
protected AbstractWebAuthnFlowTest(final String id) {
diff --git a/webauthn-impl/src/test/resources/net/shibboleth/idp/plugin/authn/webauthn/test-beans-authentication.xml b/webauthn-impl/src/test/resources/net/shibboleth/idp/plugin/authn/webauthn/test-beans-authentication.xml
index 419ca14..b64f7ac 100644
--- a/webauthn-impl/src/test/resources/net/shibboleth/idp/plugin/authn/webauthn/test-beans-authentication.xml
+++ b/webauthn-impl/src/test/resources/net/shibboleth/idp/plugin/authn/webauthn/test-beans-authentication.xml
@@ -15,7 +15,7 @@
default-destroy-method="destroy">
<bean id="AbstractCredentialPolicyRule" scope="prototype" abstract="true"
- p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.webauthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
+ p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
<!--
@@ -23,7 +23,7 @@
idp.authn.webauthn.credential.policy.enabled must be set to true for these to take effect.
-->
- <util:list id="shibboleth.authn.webauthn.ChainedCredentialPolicyList">
+ <util:list id="shibboleth.authn.WebAuthn.ChainedCredentialPolicyList">
<bean id="SecondFactorOnlyCredentialPolicyRule" parent="AbstractCredentialPolicyRule"
class="net.shibboleth.idp.plugin.authn.webauthn.policy.impl.SecondFactorOnlyCredentialPolicyRule"/>
</util:list>
diff --git a/webauthn-impl/src/test/resources/net/shibboleth/idp/plugin/authn/webauthn/test-beans-registration.xml b/webauthn-impl/src/test/resources/net/shibboleth/idp/plugin/authn/webauthn/test-beans-registration.xml
index 0b472bd..d48f123 100644
--- a/webauthn-impl/src/test/resources/net/shibboleth/idp/plugin/authn/webauthn/test-beans-registration.xml
+++ b/webauthn-impl/src/test/resources/net/shibboleth/idp/plugin/authn/webauthn/test-beans-registration.xml
@@ -15,19 +15,19 @@
default-destroy-method="destroy">
<bean id="AbstractWebAuthnRegistrationAction" scope="prototype" abstract="true"
- 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')}"/>
+ 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')}"/>
<bean id="AbstractAuthenticatorPolicyRule" scope="prototype" abstract="true"
- p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.webauthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
+ p:fidoMetadataService="#{'false'.equals('%{idp.authn.webauthn.metadata.enabled:false}') ? null : getObject('shibboleth.authn.WebAuthn.DefaultWebAuthnFidoMetadataServiceFactory')}"/>
<!--
The default list to add authenticator policies used during registration. The property
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">
+ <util:list id="shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorPolicyList">
<bean id="AllowlistAuthenticatorPolicy" parent="AbstractAuthenticatorPolicyRule"
class="net.shibboleth.idp.plugin.authn.webauthn.admin.policy.impl.AllowlistAuthenticatorPolicy"
p:allowedAuthenticators="%{idp.authn.webauthn.registration.authenticator.policy.allowedAuthenticators:null}"/>
@@ -37,8 +37,8 @@
The default list to add authenticator inspectors used during registration. The property
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="shibboleth.authn.webauthn.registration.SecondFactorOnlyInspector" scope="prototype"
+ <util:list id="shibboleth.authn.WebAuthn.registration.ChainedAuthenticatorInspectorList">
+ <bean id="shibboleth.authn.WebAuthn.registration.SecondFactorOnlyInspector" scope="prototype"
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.
More information about the commits
mailing list