[java-identity-provider] branch main updated: IDP-2100 - Eliminate unnecessary message mapping for simpler login flows

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=92e22d1cf727a1453c82ca9b839bcf67ebad05ad

The following commit(s) were added to refs/heads/main by this push:
     new 92e22d1cf IDP-2100 - Eliminate unnecessary message mapping for simpler login flows
92e22d1cf is described below

commit 92e22d1cf727a1453c82ca9b839bcf67ebad05ad
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon May 8 10:46:37 2023 -0400

    IDP-2100 - Eliminate unnecessary message mapping for simpler login flows
    
    https://shibboleth.atlassian.net/browse/IDP-2100
    
    Add default event signaling to the flow.
    Pull the XML file from the module definition.
---
 .../shibboleth/idp/flows/authn/x509-authn-flow.xml |  2 ++
 .../idp/module/authn/impl/module.properties        |  6 ++--
 .../idp/module/conf/authn/x509-authn-config.xml    | 40 ----------------------
 3 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-authn-flow.xml
index 98d59ee5a..a5d00c3f8 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-authn-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-authn-flow.xml
@@ -22,6 +22,8 @@
         <evaluate expression="'proceed'" />
 
         <transition on="proceed" to="CallSubjectCanonicalization" />
+        <transition on="NoCredentials" to="ReselectFlow" />
+        <transition on="InvalidCredentials" to="ReselectFlow" />
     </action-state>
 
     <!-- This runs a c14n step on the result of the authentication. -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/impl/module.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/impl/module.properties
index a58c46327..5ed014afe 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/impl/module.properties
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/authn/impl/module.properties
@@ -74,8 +74,6 @@ idp.authn.SPNEGO.2.dest = views/spnego-unavailable.vm
 idp.authn.X509.name = X509 Authentication
 idp.authn.X509.desc = Login flow for X.509 authentication with a dedicated protected path.
 idp.authn.X509.url = /X509AuthnConfiguration
-idp.authn.X509.1.src = /net/shibboleth/idp/module/conf/authn/x509-authn-config.xml
-idp.authn.X509.1.dest = conf/authn/x509-authn-config.xml
-idp.authn.X509.2.src = /net/shibboleth/idp/module/edit-webapp/x509-prompt.jsp
-idp.authn.X509.2.dest = edit-webapp/x509-prompt.jsp
+idp.authn.X509.1.src = /net/shibboleth/idp/module/edit-webapp/x509-prompt.jsp
+idp.authn.X509.1.dest = edit-webapp/x509-prompt.jsp
 idp.authn.X509.postenable = Customize edit-webapp/x509-prompt.jsp and rebuild war to deploy.
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/x509-authn-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/x509-authn-config.xml
deleted file mode 100644
index b6fc9ff11..000000000
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/x509-authn-config.xml
+++ /dev/null
@@ -1,40 +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">
-
-    <!--
-    The idp.authn.X509.externalAuthnPath property controls the default location to use.
-    For advanced cases, define a bean called "shibboleth.authn.X509.externalAuthnPathStrategy"
-    of type Function<ProfileRequestContext,String> that returns the path to use.
-    -->
-
-    <!--
-    Define entries here to map error messages returned by external modules and classify them as particular
-    kinds of errors for use in your templates and as events in flows.
-
-    Keys are events to signal, values are error codes.
-    
-    The examples here just allow external signaling of an exact condition.
-    
-    If you want to "fall-through" to other login flows, include a mapping to "ReselectFlow".
-    -->
-    <util:map id="shibboleth.authn.X509.ClassifiedMessageMap">
-        <entry key="ReselectFlow">
-            <list>
-                <value>NoCredentials</value>
-                <value>InvalidCredentials</value>
-            </list>
-        </entry>
-    </util:map>
-    
-</beans>

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