[java-idp-plugin-webauthn] branch main updated: Update module properties and remove webauthn selector
Phil Smart
philip.smart at jisc.ac.uk
Fri Feb 16 11:59:41 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=fcb1f807b34a46eb06b2485d1c5440844d3df210
The following commit(s) were added to refs/heads/main by this push:
new fcb1f80 Update module properties and remove webauthn selector
fcb1f80 is described below
commit fcb1f807b34a46eb06b2485d1c5440844d3df210
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Feb 16 11:59:39 2024 +0000
Update module properties and remove webauthn selector
---
.../META-INF/net.shibboleth.idp/postconfig.xml | 26 +--------
.../webauthn-registration-flow.xml | 2 +-
.../authn/WebAuthnFlowChooser/webauthn-flow.xml | 18 -------
.../idp/plugin/authn/webauthn/module.properties | 12 ++---
.../authn/webauthn/views/webauthn-selector.vm | 62 ----------------------
5 files changed, 8 insertions(+), 112 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 a9ee84a..0d4ce9a 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
@@ -13,31 +13,7 @@
System beans needed for extension to function, loaded after global.xml.
The default template shows an incomplete example authentication flow descriptor which can be
removed if not needed
- -->
-
- <!-- Authentication flow selection flow -->
- <bean id="authn/WebAuthnFlowChooser" parent="shibboleth.AuthenticationFlow"
- p:order="1000"
- p:nonBrowserSupported="false"
- p:passiveAuthenticationSupported="false"
- p:forcedAuthenticationSupported="true"
- p:lifetime="%{idp.authn.webauthn.lifetime:%{idp.authn.defaultLifetime:PT1H}}"
- p:inactivityTimeout="%{idp.authn.webauthn.inactivityTimeout:%{idp.authn.defaultTimeout:PT30M}}"
- p:reuseCondition-ref="#{'%{idp.authn.webauthn.reuseCondition:shibboleth.Conditions.TRUE}'.trim()}"
- p:activationCondition-ref="#{'%{idp.authn.webauthn.activationCondition:shibboleth.Conditions.TRUE}'.trim()}">
- <property name="supportedPrincipals">
- <list>
- <bean parent="shibboleth.SAML2AuthnContextClassRef"
- c:classRef="class-ref" />
- <bean parent="shibboleth.SAML1AuthenticationMethod"
- c:method="auth-ref" />
- </list>
- </property>
- <property name="supportedPrincipalsByString">
- <bean parent="shibboleth.CommaDelimStringArray"
- c:_0="#{'%{idp.authn.webauthn.supportedPrincipals:}'.trim()}" />
- </property>
- </bean>
+ -->
<!-- WebAuthn authentication flow -->
<bean id="authn/WebAuthn" parent="shibboleth.AuthenticationFlow"
diff --git a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-registration/webauthn-registration-flow.xml b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-registration/webauthn-registration-flow.xml
index b7c4519..d484692 100644
--- a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-registration/webauthn-registration-flow.xml
+++ b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-registration/webauthn-registration-flow.xml
@@ -14,7 +14,7 @@
</action-state>
- <view-state id="CollectUsernameView" view="webauthn/webauthn-username-register">
+ <view-state id="CollectUsernameView" view="webauthn/webauthn-register-username">
<on-render>
<evaluate expression="environment" result="viewScope.environment" />
<evaluate expression="opensamlProfileRequestContext" result="viewScope.profileRequestContext" />
diff --git a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthnFlowChooser/webauthn-flow.xml b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthnFlowChooser/webauthn-flow.xml
deleted file mode 100644
index 7e8dab1..0000000
--- a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/WebAuthnFlowChooser/webauthn-flow.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<flow xmlns="http://www.springframework.org/schema/webflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
- parent="authn.abstract, authn/conditions">
-
- <!-- end-state transitions are inherited from authn-events-flow.xml -->
- <view-state id="DisplayWebAuthnChoiceView" view="webauthn/webauthn-selector">
- <on-render>
- <evaluate expression="environment" result="viewScope.environment" />
- <evaluate expression="opensamlProfileRequestContext" result="viewScope.profileRequestContext" />
- <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="viewScope.encoder" />
- <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="viewScope.request" />
- <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="viewScope.response" />
- </on-render>
- <transition on="proceed" to="WebAuthnFlow" />
- <transition on="password" to="PasswordFlow" />
- </view-state>
-
-</flow>
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 163ffbf..c6e63c1 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
@@ -24,14 +24,14 @@ idp.authn.WebAuthn.3.dest = views/webauthn/webauthn-authn.vm
idp.authn.WebAuthn.4.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-register.vm
idp.authn.WebAuthn.4.dest = views/webauthn/webauthn-register.vm
-idp.authn.WebAuthn.5.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-registered.vm
-idp.authn.WebAuthn.5.dest = views/webauthn/webauthn-registered.vm
+idp.authn.WebAuthn.5.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-register-username.vm
+idp.authn.WebAuthn.5.dest = views/webauthn/webauthn-register-username.vm
-idp.authn.WebAuthn.6.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-username.vm
-idp.authn.WebAuthn.6.dest = views/webauthn/webauthn-username.vm
+idp.authn.WebAuthn.6.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-registered.vm
+idp.authn.WebAuthn.6.dest = views/webauthn/webauthn-registered.vm
-idp.authn.WebAuthn.7.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-selector.vm
-idp.authn.WebAuthn.7.dest = views/webauthn/webauthn-selector.vm
+idp.authn.WebAuthn.7.src = /net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-username.vm
+idp.authn.WebAuthn.7.dest = views/webauthn/webauthn-username.vm
idp.authn.WebAuthn.8.src = /net/shibboleth/idp/plugin/authn/webauthn/css/webauthn.css
idp.authn.WebAuthn.8.dest = edit-webapp/css/webauthn.css
diff --git a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-selector.vm b/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-selector.vm
deleted file mode 100644
index 701f49f..0000000
--- a/webauthn-impl/src/main/resources/net/shibboleth/idp/plugin/authn/webauthn/views/webauthn-selector.vm
+++ /dev/null
@@ -1,62 +0,0 @@
-##
-## Velocity Template for DisplayWebauthnView view-state
-##
-## Velocity context will contain the following properties
-## flowExecutionUrl - the form action location
-## flowRequestContext - the Spring Web Flow RequestContext
-## flowExecutionKey - the SWF execution key (this is built into the flowExecutionUrl)
-## profileRequestContext - root of context tree
-## encoder - HTMLEncoder class
-## request - HttpServletRequest
-## response - HttpServletResponse
-## environment - Spring Environment object for property resolution
-## custom - arbitrary object injected by deployer
-##
-#set ($rpContext = $profileRequestContext.getSubcontext('net.shibboleth.profile.context.RelyingPartyContext'))
-##
-<!DOCTYPE html>
-<html>
- <head>
- <title>#springMessageText("idp.title", "Web Login Service")</title>
- <meta charset="UTF-8" />
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=5.0">
- <link rel="stylesheet" type="text/css" href="$request.getContextPath()#springMessageText("idp.css", "/css/placeholder.css")">
- <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/webauthn.css">
- </head>
- <body>
- <main class="main">
- <header>
- <img class="main-logo" src="$request.getContextPath()#springMessageText("idp.logo", "/images/placeholder-logo.png")" alt="#springMessageText("idp.logo.alt-text", "logo")" />
-
- #set ($serviceName = $rpUIContext.serviceName)
- #if ($serviceName && !$rpContext.getRelyingPartyId().contains($serviceName))
- <h1>#springMessageText("idp.login.loginTo", "Login to") $encoder.encodeForHTML($serviceName)</h1>
- #end
- </header>
- <section>
- <div class="centre">
- <div class="grid">
- <div class="grid-item">
- <form action="$flowExecutionUrl" method="post">
- #parse("csrf/csrf.vm")
- <button type="submit" name="_eventId_proceed">Use Security Key</button>
- </form>
- </div>
- <div class="grid-item">
- <form action="$flowExecutionUrl" method="post">
- #parse("csrf/csrf.vm")
- <button type="submit" name="_eventId_password">Use Password</button>
- </form>
- </div>
- </div>
- </div>
- </section>
- </main>
- <footer class="footer">
- <div class="cc">
- <p>#springMessageText("idp.footer", "Insert your footer text here.")</p>
- </div>
- </footer>
- </body>
-</html>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list