[java-idp-plugin-webauthn] 04/04: Cleanup and simplify XML config files
Phil Smart
philip.smart at jisc.ac.uk
Fri Nov 8 16:24:47 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=ab66078fce37b1f062686ca51b3923a4dd0cf8cf
commit ab66078fce37b1f062686ca51b3923a4dd0cf8cf
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Nov 8 16:21:37 2024 +0000
Cleanup and simplify XML config files
---
.../webauthn-management-beans.xml | 1 -
.../webauthn-registration-beans.xml | 1 -
.../idp/flows/authn/WebAuthn/webauthn-beans.xml | 1 -
.../conf/authn/webauthn-authentication-config.xml | 24 -----------
.../authn/webauthn/conf/authn/webauthn-config.xml | 20 ++++------
.../conf/authn/webauthn-management-config.xml | 12 ++++++
.../conf/authn/webauthn-registration-config.xml | 13 ++++++
.../idp/plugin/authn/webauthn/module.properties | 46 ++++++++++------------
8 files changed, 53 insertions(+), 65 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 d1ac708..404df98 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
@@ -140,6 +140,5 @@
</bean>
<import resource="conditional:%{idp.home}/conf/authn/webauthn-management-config.xml" />
- <import resource="conditional:%{idp.home}/conf/authn/webauthn-config.xml" />
</beans>
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 5891926..e823f79 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
@@ -253,6 +253,5 @@
</bean>
<import resource="conditional:%{idp.home}/conf/authn/webauthn-registration-config.xml" />
- <import resource="conditional:%{idp.home}/conf/authn/webauthn-config.xml" />
</beans>
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 d9dd67e..410e153 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
@@ -216,7 +216,6 @@
</property>
</bean>
- <import resource="conditional:%{idp.home}/conf/authn/webauthn-authentication-config.xml" />
<import resource="conditional:%{idp.home}/conf/authn/webauthn-config.xml" />
</beans>
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-authentication-config.xml b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-authentication-config.xml
deleted file mode 100644
index a627a7e..0000000
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-authentication-config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
-
- <!--
- If enabled, the default list to add credential policies used during authentication.
- -->
- <util:list id="shibboleth.authn.WebAuthn.ChainedCredentialPolicyList">
-
- <bean id="SecondFactorOnlyCredentialPolicyRule" parent="shibboleth.authn.WebAuthn.AbstractCredentialPolicyRule"
- class="net.shibboleth.idp.plugin.authn.webauthn.policy.impl.SecondFactorOnlyCredentialPolicyRule"
- p:secondFactorOnlyAuthenticators="%{idp.authn.webauthn.authenticator.policy.secondFactorOnlyAuthenticators:null}"/>
-
- </util:list>
-
-
-</beans>
\ No newline at end of file
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 ef4f00b..637576e 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
@@ -9,22 +9,16 @@
default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
- <!-- Configuration that is shared between two or more WebAuthn flows -->
-
-
+
<!--
- The default credential labeller list. Use during registration or management flows to label credentials for display
- in the UI.
+ If enabled, the default list to add credential policies used during authentication.
-->
- <util:list id="shibboleth.authn.WebAuthn.CredentialLabellerList">
+ <util:list id="shibboleth.authn.WebAuthn.ChainedCredentialPolicyList">
- <bean id="CapabilitiesCredentialLabeller" scope="prototype"
- class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.SecondFactorOnlyCredentialLabeller"
- p:secondFactorOnlyAuthenticators="%{idp.authn.webauthn.authenticator.policy.secondFactorOnlyAuthenticators:null}"
- p:label="SecondFactorOnly"/>
-
- <bean id="PasskeyCredentialLabeller" class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.PasskeyCredentialLabeller"/>
+ <bean id="SecondFactorOnlyCredentialPolicyRule" parent="shibboleth.authn.WebAuthn.AbstractCredentialPolicyRule"
+ class="net.shibboleth.idp.plugin.authn.webauthn.policy.impl.SecondFactorOnlyCredentialPolicyRule"
+ p:secondFactorOnlyAuthenticators="%{idp.authn.webauthn.authenticator.policy.secondFactorOnlyAuthenticators:null}"/>
+
</util:list>
-
</beans>
\ No newline at end of file
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-management-config.xml b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-management-config.xml
index 92416d5..0ccbfe1 100644
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-management-config.xml
+++ b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-management-config.xml
@@ -9,5 +9,17 @@
default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
+ <!--
+ The default credential labeller list. Use during the management flow to label user credentials for display in the UI.
+ -->
+ <util:list id="shibboleth.authn.WebAuthn.CredentialLabellerList">
+
+ <bean id="CapabilitiesCredentialLabeller" scope="prototype"
+ class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.SecondFactorOnlyCredentialLabeller"
+ p:secondFactorOnlyAuthenticators="%{idp.authn.webauthn.authenticator.policy.secondFactorOnlyAuthenticators:null}"
+ p:label="SecondFactorOnly"/>
+
+ <bean id="PasskeyCredentialLabeller" class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.PasskeyCredentialLabeller"/>
+ </util:list>
</beans>
\ No newline at end of file
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 c725782..b934e98 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
@@ -18,6 +18,19 @@
class="net.shibboleth.idp.plugin.authn.webauthn.admin.policy.impl.AllowlistAuthenticatorPolicy"
p:allowedAuthenticators="%{idp.authn.webauthn.registration.authenticator.policy.allowedAuthenticators:null}"/>
+ </util:list>
+
+ <!--
+ The default credential labeller list. Use during registration to label user credentials for display in the registration UI.
+ -->
+ <util:list id="shibboleth.authn.WebAuthn.CredentialLabellerList">
+
+ <bean id="CapabilitiesCredentialLabeller" scope="prototype"
+ class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.SecondFactorOnlyCredentialLabeller"
+ p:secondFactorOnlyAuthenticators="%{idp.authn.webauthn.authenticator.policy.secondFactorOnlyAuthenticators:null}"
+ p:label="SecondFactorOnly"/>
+
+ <bean id="PasskeyCredentialLabeller" class="net.shibboleth.idp.plugin.authn.webauthn.admin.impl.PasskeyCredentialLabeller"/>
</util:list>
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/module.properties b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/module.properties
index 179231d..6365961 100644
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/module.properties
+++ b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/module.properties
@@ -34,39 +34,35 @@ idp.authn.WebAuthn.6.src = /net/shibboleth/idp/plugin/authn/webauthn/conf/authn/
idp.authn.WebAuthn.6.dest = conf/authn/webauthn-management-config.xml
idp.authn.WebAuthn.6.replace = false
-idp.authn.WebAuthn.7.src = /net/shibboleth/idp/plugin/authn/webauthn/conf/authn/webauthn-authentication-config.xml
-idp.authn.WebAuthn.7.dest = conf/authn/webauthn-authentication-config.xml
-idp.authn.WebAuthn.7.replace = false
+idp.authn.WebAuthn.7.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-authn.vm
+idp.authn.WebAuthn.7.dest = views/webauthn/webauthn-authn.vm
-idp.authn.WebAuthn.8.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-authn.vm
-idp.authn.WebAuthn.8.dest = views/webauthn/webauthn-authn.vm
+idp.authn.WebAuthn.8.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-register.vm
+idp.authn.WebAuthn.8.dest = views/webauthn/webauthn-register.vm
-idp.authn.WebAuthn.9.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-register.vm
-idp.authn.WebAuthn.9.dest = views/webauthn/webauthn-register.vm
+idp.authn.WebAuthn.9.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-register-username.vm
+idp.authn.WebAuthn.9.dest = views/webauthn/webauthn-register-username.vm
-idp.authn.WebAuthn.10.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-register-username.vm
-idp.authn.WebAuthn.10.dest = views/webauthn/webauthn-register-username.vm
+idp.authn.WebAuthn.10.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-authn-username.vm
+idp.authn.WebAuthn.10.dest = views/webauthn/webauthn-authn-username.vm
-idp.authn.WebAuthn.11.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-authn-username.vm
-idp.authn.WebAuthn.11.dest = views/webauthn/webauthn-authn-username.vm
+idp.authn.WebAuthn.11.src = /net/shibboleth/idp/plugin/authn/webauthn/css/webauthn.css
+idp.authn.WebAuthn.11.dest = edit-webapp/css/webauthn.css
+idp.authn.WebAuthn.11.postenable = Customize edit-webapp/css/webauthn.css and rebuild war to deploy.
-idp.authn.WebAuthn.12.src = /net/shibboleth/idp/plugin/authn/webauthn/css/webauthn.css
-idp.authn.WebAuthn.12.dest = edit-webapp/css/webauthn.css
-idp.authn.WebAuthn.12.postenable = Customize edit-webapp/css/webauthn.css and rebuild war to deploy.
+idp.authn.WebAuthn.12.src = /net/shibboleth/idp/plugin/authn/webauthn/js/webauthn-json.browser-ponyfill.min.js
+idp.authn.WebAuthn.12.dest = edit-webapp/js/webauthn/webauthn-json.browser-ponyfill.min.js
-idp.authn.WebAuthn.13.src = /net/shibboleth/idp/plugin/authn/webauthn/js/webauthn-json.browser-ponyfill.min.js
-idp.authn.WebAuthn.13.dest = edit-webapp/js/webauthn/webauthn-json.browser-ponyfill.min.js
+idp.authn.WebAuthn.13.src = /net/shibboleth/idp/plugin/authn/webauthn/js/webauthn-support.js
+idp.authn.WebAuthn.13.dest = edit-webapp/js/webauthn/webauthn-support.js
-idp.authn.WebAuthn.14.src = /net/shibboleth/idp/plugin/authn/webauthn/js/webauthn-support.js
-idp.authn.WebAuthn.14.dest = edit-webapp/js/webauthn/webauthn-support.js
+idp.authn.WebAuthn.14.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-end.vm
+idp.authn.WebAuthn.14.dest = views/webauthn/webauthn-end.vm
-idp.authn.WebAuthn.15.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-end.vm
-idp.authn.WebAuthn.15.dest = views/webauthn/webauthn-end.vm
+idp.authn.WebAuthn.15.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-management.vm
+idp.authn.WebAuthn.15.dest = views/webauthn/webauthn-management.vm
-idp.authn.WebAuthn.16.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-management.vm
-idp.authn.WebAuthn.16.dest = views/webauthn/webauthn-management.vm
-
-idp.authn.WebAuthn.17.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-management-search.vm
-idp.authn.WebAuthn.17.dest = views/webauthn/webauthn-management-search.vm
+idp.authn.WebAuthn.16.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-management-search.vm
+idp.authn.WebAuthn.16.dest = views/webauthn/webauthn-management-search.vm
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list