[java-idp-plugin-webauthn] branch main updated: JWEBAUTHN-66 - management view search breaks after failing to find a user

[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:
https://git.shibboleth.net/view/?p=java-idp-plugin-webauthn.git;a=commit;h=1918ad5f968226f85d8da7002cfbb1b31536dbeb

The following commit(s) were added to refs/heads/main by this push:
     new 1918ad5  JWEBAUTHN-66 - management view search breaks after failing to find a user
1918ad5 is described below

commit 1918ad5f968226f85d8da7002cfbb1b31536dbeb
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Oct 30 15:54:43 2025 +0000

    JWEBAUTHN-66 - management view search breaks after failing to find a
    user
    
     - Ensure the c14n context is removed even if the user's prinicpal name
    is not found
    
    https://shibboleth.atlassian.net/browse/JWEBAUTHN-66
---
 .../webauthn/admin/impl/UpdateAdminContextWithC14nPrincipal.java   | 2 ++
 .../flows/admin/webauthn-management/webauthn-management-flow.xml   | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/admin/impl/UpdateAdminContextWithC14nPrincipal.java b/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/admin/impl/UpdateAdminContextWithC14nPrincipal.java
index 20999c6..e3b4636 100644
--- a/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/admin/impl/UpdateAdminContextWithC14nPrincipal.java
+++ b/webauthn-impl/src/main/java/net/shibboleth/idp/plugin/authn/webauthn/admin/impl/UpdateAdminContextWithC14nPrincipal.java
@@ -87,6 +87,8 @@ public class UpdateAdminContextWithC14nPrincipal extends AbstractWebAuthnAction<
         final String principalName = c14n.getPrincipalName();
         if (StringSupport.trimOrNull(principalName) == null) {
             log.debug("{} No username in c14n context", getLogPrefix());
+            // Make sure we remove the c14n context
+            c14n.removeFromParent();
             ActionSupport.buildEvent(profileRequestContext, WebAuthnRegistrationEventIds.NO_SEARCH_USERNAME_AFTER_C14N);
             return;
         }
diff --git a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-management/webauthn-management-flow.xml b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-management/webauthn-management-flow.xml
index f5bbd7d..f939de7 100644
--- a/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-management/webauthn-management-flow.xml
+++ b/webauthn-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/webauthn-management/webauthn-management-flow.xml
@@ -46,7 +46,12 @@
         </on-render>
         
        <transition on="proceed" to="ExtractSearchFields" />
-       <transition on="finish" to="ManagementComplete" />       
+       <transition on="finish" to="ManagementComplete" />      
+       
+       <on-exit>
+         <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.plugin.authn.webauthn.context.WebAuthnManagementContext)).ensureSubcontext(T(net.shibboleth.idp.plugin.authn.webauthn.context.WebAuthnRegistrationInformationContext)).reset()"/>
+         <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.plugin.authn.webauthn.context.WebAuthnManagementContext)).ensureSubcontext(T(net.shibboleth.idp.plugin.authn.webauthn.context.WebAuthnRegistrationErrorContext)).reset()"/>
+       </on-exit>    
     </view-state>
     
     <action-state id="ExtractSearchFields">       

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