[java-identity-provider] branch main updated: Move conditions flows into Password module, load flows from module tree.

[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=67ce1298606563c870caa7dc26d5cbf080d5f8c9

The following commit(s) were added to refs/heads/main by this push:
     new 67ce12986 Move conditions flows into Password module, load flows from module tree.
67ce12986 is described below

commit 67ce1298606563c870caa7dc26d5cbf080d5f8c9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue May 9 11:10:54 2023 -0400

    Move conditions flows into Password module, load flows from module tree.
---
 .../net/shibboleth/idp/module/authn/impl/module.properties     |  9 +++++++++
 .../authn/conditions/account-locked/account-locked-flow.xml    |  0
 .../idp/module}/flows/authn/conditions/conditions-flow.xml     |  0
 .../conditions/expired-password/expired-password-flow.xml      |  0
 .../conditions/expiring-password/expiring-password-flow.xml    |  0
 idp-conf/src/test/resources/conf/global.xml                    | 10 ++++++++++
 6 files changed, 19 insertions(+)

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 fc6f2a9e1..91b66bf01 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
@@ -41,6 +41,15 @@ idp.authn.Password.2.src = /net/shibboleth/idp/module/views/login.vm
 idp.authn.Password.2.dest = views/login.vm
 idp.authn.Password.3.src = /net/shibboleth/idp/module/views/login-error.vm
 idp.authn.Password.3.dest = views/login-error.vm
+idp.authn.Password.4.src = /net/shibboleth/idp/module/flows/authn/conditions/conditions-flow.xml
+idp.authn.Password.4.dest = flows/authn/conditions/conditions-flow.xml
+idp.authn.Password.5.src = /net/shibboleth/idp/module/flows/authn/conditions/account-locked/account-locked-flow.xml
+idp.authn.Password.5.dest = flows/authn/conditions/account-locked/account-locked-flow.xml
+idp.authn.Password.6.src = /net/shibboleth/idp/module/flows/authn/conditions/expired-password/expired-password-flow.xml
+idp.authn.Password.6.dest = flows/authn/conditions/expired-password/expired-password-flow.xml
+idp.authn.Password.7.src = /net/shibboleth/idp/module/flows/authn/conditions/expiring-password/expiring-password-flow.xml
+idp.authn.Password.7.dest = flows/authn/conditions/expiring-password/expiring-password-flow.xml
+
 
 idp.authn.Demo.name = Demo Authentication
 idp.authn.Demo.desc = Demo htpasswd file for use with password-based authentication
diff --git a/idp-conf/src/main/resources/flows/authn/conditions/account-locked/account-locked-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/flows/authn/conditions/account-locked/account-locked-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/flows/authn/conditions/account-locked/account-locked-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/flows/authn/conditions/account-locked/account-locked-flow.xml
diff --git a/idp-conf/src/main/resources/flows/authn/conditions/conditions-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/flows/authn/conditions/conditions-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/flows/authn/conditions/conditions-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/flows/authn/conditions/conditions-flow.xml
diff --git a/idp-conf/src/main/resources/flows/authn/conditions/expired-password/expired-password-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/flows/authn/conditions/expired-password/expired-password-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/flows/authn/conditions/expired-password/expired-password-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/flows/authn/conditions/expired-password/expired-password-flow.xml
diff --git a/idp-conf/src/main/resources/flows/authn/conditions/expiring-password/expiring-password-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/flows/authn/conditions/expiring-password/expiring-password-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/flows/authn/conditions/expiring-password/expiring-password-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/flows/authn/conditions/expiring-password/expiring-password-flow.xml
diff --git a/idp-conf/src/test/resources/conf/global.xml b/idp-conf/src/test/resources/conf/global.xml
index 9c2678528..befcd87e4 100644
--- a/idp-conf/src/test/resources/conf/global.xml
+++ b/idp-conf/src/test/resources/conf/global.xml
@@ -92,6 +92,16 @@
         <jdbc:script location="classpath:/test/test-jdbc.sql"/>
     </jdbc:initialize-database>
 
+    <!-- Allows flows to run out of the module source tree. -->
+    <bean id="shibboleth.FlowPatterns" parent="shibboleth.DefaultFlowPatterns">
+        <property name="sourceMap">
+            <map merge="true">
+                <entry key="classpath*:/net/shibboleth/idp/module/flows/**/*-flow.xml"
+                    value="/net/shibboleth/idp/module/flows" />
+            </map>
+        </property>
+    </bean>
+    
     <!--
     <bean id="shibboleth.authn.TOTP.SeedSource" parent="shibboleth.authn.TOTP.StaticSeedSource">
         <property name="seeds">

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