[java-idp-plugin-webauthn] branch main updated: Improve bean identifiers
Phil Smart
philip.smart at jisc.ac.uk
Tue Nov 12 12:11:20 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=792b03f7ed29d39336e476c1e5c04146de27ddf8
The following commit(s) were added to refs/heads/main by this push:
new 792b03f Improve bean identifiers
792b03f is described below
commit 792b03f7ed29d39336e476c1e5c04146de27ddf8
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Tue Nov 12 12:11:17 2024 +0000
Improve bean identifiers
---
.../webauthn-management-beans.xml | 4 ++--
.../webauthn-registration-beans.xml | 22 +++++++++++-----------
.../authn/WebAuthn/webauthn-abstract-beans.xml | 10 +++++-----
.../conf/authn/webauthn-registration.properties | 6 +++---
4 files changed, 21 insertions(+), 21 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 404df98..881b1a4 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
@@ -106,7 +106,7 @@
<!-- Audit logging beans -->
- <util:map id="shibboleth.admin.AuditFormattingMap">
+ <util:map id="shibboleth.authn.WebAuthn.admin.AuditFormattingMap">
<entry key="#{'%{idp.authn.webauthn.admin.management.audit.category:Shibboleth-Audit.WebAuthnManagment}'.trim()}"
value="#{'%{idp.authn.webauthn.admin.management.audit.format:%a|%T|%u|%WebAuthnAdminAO|%WebAuthnAdminAction|%WebAuthnAdminCR|%WebAuthnAdminAU|%UA}'.trim()}" />
</util:map>
@@ -115,7 +115,7 @@
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.authn.WebAuthn.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 e823f79..3b588ef 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
@@ -95,10 +95,10 @@
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.registration.SubjectContextUsernameLookupStrategy}')}">
</bean>
- <bean id="shibboleth.authn.WebAuthn.SubjectContextUsernameLookupStrategy" lazy-init="true" scope="singleton"
+ <bean id="shibboleth.authn.WebAuthn.registration.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"
@@ -141,28 +141,28 @@
<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.registration.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.registration.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.registration.SubjectContextDisplayNameLookupStrategy}')}"/>
- <bean id="shibboleth.authn.WebAuthn.SubjectContextDisplayNameLookupStrategy" lazy-init="true"
+ <bean id="shibboleth.authn.WebAuthn.registration.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.registration.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.registration.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.registration.RandomUserIdGenerator" scope="singleton" lazy-init="true"
class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.RandomUserIdGenerator"/>
<bean id="CreatePublicKeyCredentialCreationOptions" parent="AbstractWebAuthnRegistrationAction" scope="prototype"
@@ -218,7 +218,7 @@
<!-- Audit logging beans -->
- <util:map id="shibboleth.admin.AuditFormattingMap">
+ <util:map id="shibboleth.authn.WebAuthn.admin.AuditFormattingMap">
<entry key="#{'%{idp.authn.webauthn.registration.audit.category:Shibboleth-Audit.WebAuthnRegistration}'.trim()}"
value="#{'%{idp.authn.webauthn.registration.audit.format:%a|%T|%u|%WebAuthnAdminAO|%WebAuthnAdminAction|%WebAuthnAdminCR|%WebAuthnAdminCA|%WebAuthnAdminAU|%UA}'.trim()}" />
</util:map>
@@ -228,7 +228,7 @@
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.authn.WebAuthn.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 1f483e1..e75cce9 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
@@ -67,7 +67,7 @@
<bean id="WriteAdminAuditLog"
class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype" lazy-init="true"
- p:formattingMap-ref="shibboleth.admin.AuditFormattingMap"
+ p:formattingMap-ref="shibboleth.authn.WebAuthn.admin.AuditFormattingMap"
p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
p:includeProfileLoggingId="false"
@@ -81,20 +81,20 @@
c:type="#{ T(net.shibboleth.profile.context.AuditContext) }"
c:createContext="true" />
- <bean id="shibboleth.admin.AuditFormattingMapParser" scope="prototype" lazy-init="true"
+ <bean id="shibboleth.authn.WebAuthn.admin.AuditFormattingMapParser" scope="prototype" lazy-init="true"
class="net.shibboleth.idp.profile.audit.impl.PopulateAuditContext.FormattingMapParser"
- c:_0-ref="shibboleth.admin.AuditFormattingMap" />
+ c:_0-ref="shibboleth.authn.WebAuthn.admin.AuditFormattingMap" />
<bean id="shibboleth.admin.AbstractPopulateAuditContext" abstract="true"
class="net.shibboleth.idp.profile.audit.impl.PopulateAuditContext" scope="prototype"
p:auditContextCreationStrategy-ref="AdminAuditContextLookup"
- p:formattingMapParser-ref="shibboleth.admin.AuditFormattingMapParser"
+ p:formattingMapParser-ref="shibboleth.authn.WebAuthn.admin.AuditFormattingMapParser"
p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
p:fieldReplacements="#{getObject('shibboleth.AuditFieldReplacementMap')}" />
- <bean id="shibboleth.admin.DefaultAuditExtractors" lazy-init="true"
+ <bean id="shibboleth.authn.WebAuthn.admin.DefaultAuditExtractors" lazy-init="true"
class="org.springframework.beans.factory.config.MapFactoryBean">
<property name="sourceMap">
<map>
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 bbd3c4e..f43929d 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
@@ -17,17 +17,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.registration.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.registration.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.registration.SubjectContextDisplayNameLookupStrategy
# If using the attribute context lookup strategy, which attribute should the user.displayName be taken from
#idp.authn.webauthn.registration.displayname.attributeId = mail
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list