[java-identity-provider] branch master updated: IDP-1242 - Flow bean import issues when defining child flows externally

Scott Cantor cantor.2 at osu.edu
Thu Dec 28 16:01:38 EST 2017 

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  58d0332   IDP-1242 - Flow bean import issues when defining child flows externally
58d0332 is described below

commit 58d03326f5ceca493662fd1664adecc31218d3ad
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Dec 28 16:01:36 2017 -0500

    IDP-1242 - Flow bean import issues when defining child flows externally
    
    https://issues.shibboleth.net/jira/browse/IDP-1242
    
    Retrofit imports in SAML and admin flows.
---
 idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml | 2 --
 idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml       | 2 ++
 .../src/main/resources/system/flows/admin/reload-metadata-beans.xml    | 2 ++
 .../src/main/resources/system/flows/admin/reload-service-beans.xml     | 2 ++
 idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml  | 2 ++
 idp-conf/src/main/resources/system/flows/admin/status-beans.xml        | 2 ++
 idp-conf/src/main/resources/system/flows/admin/storage-beans.xml       | 2 ++
 idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml   | 3 ---
 idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml   | 2 ++
 .../main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml   | 2 ++
 idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml   | 2 ++
 .../src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml    | 2 ++
 .../main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml | 2 --
 idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-beans.xml | 2 ++
 .../resources/system/flows/saml/saml2/slo-post-simplesign-beans.xml    | 2 ++
 .../src/main/resources/system/flows/saml/saml2/slo-redirect-beans.xml  | 2 ++
 .../src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml  | 3 ---
 .../src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml   | 2 --
 idp-conf/src/main/resources/system/flows/saml/saml2/sso-ecp-beans.xml  | 2 ++
 idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-beans.xml | 2 ++
 .../resources/system/flows/saml/saml2/sso-post-simplesign-beans.xml    | 2 ++
 .../src/main/resources/system/flows/saml/saml2/sso-redirect-beans.xml  | 2 ++
 .../main/resources/system/flows/saml/saml2/sso-unsolicited-beans.xml   | 2 ++
 23 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml b/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
index 7299166..ff679fe 100644
--- a/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
@@ -152,6 +152,4 @@
         <transition on="#{!'proceed'.equals(currentEvent.id)}" to="HandleError" />
     </global-transitions>
 
-    <bean-import resource="admin-abstract-beans.xml" />
-
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml b/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml
index 5ffa99a..c7f1c13 100644
--- a/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml
@@ -15,6 +15,8 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
+    <import resource="admin-abstract-beans.xml" />
+
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
         c:_0="http://shibboleth.net/ns/profiles/metrics" />
diff --git a/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml b/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml
index 3b7a485..3c7dd4d 100644
--- a/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml
@@ -15,6 +15,8 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
+    <import resource="admin-abstract-beans.xml" />
+
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
         c:_0="http://shibboleth.net/ns/profiles/reload-metadata" />
diff --git a/idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml b/idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml
index 8ff4950..8f2209d 100644
--- a/idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml
@@ -15,6 +15,8 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
+    <import resource="admin-abstract-beans.xml" />
+
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
         c:_0="http://shibboleth.net/ns/profiles/reload-service-configuration" />
diff --git a/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml b/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
index 1f2d781..bddb992 100644
--- a/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
@@ -15,6 +15,8 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
+    <import resource="admin-abstract-beans.xml" />
+
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
         c:_0="http://shibboleth.net/ns/profiles/resolvertest" />
diff --git a/idp-conf/src/main/resources/system/flows/admin/status-beans.xml b/idp-conf/src/main/resources/system/flows/admin/status-beans.xml
index dcd5558..048d1d1 100644
--- a/idp-conf/src/main/resources/system/flows/admin/status-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/status-beans.xml
@@ -15,6 +15,8 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
+    <import resource="admin-abstract-beans.xml" />
+
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String" c:_0="http://shibboleth.net/ns/profiles/status" />
     
diff --git a/idp-conf/src/main/resources/system/flows/admin/storage-beans.xml b/idp-conf/src/main/resources/system/flows/admin/storage-beans.xml
index a3415fa..62e8f1f 100644
--- a/idp-conf/src/main/resources/system/flows/admin/storage-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/storage-beans.xml
@@ -15,6 +15,8 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
+    <import resource="admin-abstract-beans.xml" />
+
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String" c:_0="http://shibboleth.net/ns/profiles/storage" />
     
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml b/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
index e0ad7c2..5018f27 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
@@ -191,7 +191,4 @@
         <transition on="#{!'proceed'.equals(currentEvent.id)}" to="HandleError" />
     </global-transitions>
 
-    <!-- The import references the parent folder because the abstract flow is used only from one level down. -->
-    <bean-import resource="../saml-abstract-beans.xml" />
-
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml
index a74123b..e53c4ff 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml
@@ -12,6 +12,8 @@
     default-init-method="initialize"
     default-destroy-method="destroy">
 
+    <import resource="../saml-abstract-beans.xml" />
+
     <util:constant id="shibboleth.MetadataLookup.Protocol"
         static-field="org.opensaml.saml.common.xml.SAMLConstants.SAML11P_NS" />
 
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml
index f06e143..32135ec 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml
@@ -11,6 +11,8 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <import resource="sso-abstract-beans.xml" />
+
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
             <bean class="net.shibboleth.idp.saml.saml1.profile.impl.IdPInitiatedSSORequestMessageDecoder" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml
index 7565f98..8caa745 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml
@@ -12,6 +12,8 @@
     default-init-method="initialize"
     default-destroy-method="destroy">
     
+    <import resource="../saml-abstract-beans.xml" />
+    
     <util:constant id="shibboleth.MetadataLookup.Protocol"
         static-field="org.opensaml.saml.common.xml.SAMLConstants.SAML20P_NS" />
 
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
index f34ccb8..f4ce453 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
@@ -11,6 +11,8 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <import resource="sso-abstract-beans.xml" />
+
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId="#{T(net.shibboleth.idp.saml.idwsf.profile.config.SSOSProfileConfiguration).PROFILE_ID}"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml
index 5eb262d..f9e6c4c 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml
@@ -232,6 +232,4 @@
         </on-entry>
     </end-state>
 
-    <bean-import resource="slo-front-abstract-beans.xml" />
-
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-beans.xml
index d6775c2..4b70346 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-beans.xml
@@ -11,6 +11,8 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <import resource="slo-front-abstract-beans.xml" />
+
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
             <bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPPostDecoder" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-simplesign-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-simplesign-beans.xml
index 0f7a04f..ea474ff 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-simplesign-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-simplesign-beans.xml
@@ -11,6 +11,8 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <import resource="slo-front-abstract-beans.xml" />
+
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
             <bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPPostSimpleSignDecoder" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-redirect-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/slo-redirect-beans.xml
index 8e20782..11ae8d1 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-redirect-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/slo-redirect-beans.xml
@@ -11,6 +11,8 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
         
+    <import resource="slo-front-abstract-beans.xml" />
+        
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
             <bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPRedirectDeflateDecoder" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
index bc06edd..8fd12b5 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
@@ -10,9 +10,6 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
        default-init-method="initialize"
        default-destroy-method="destroy">
-
-    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
     
     <!-- Note: Don't define DecodeMessage action here, that is defined in beans definition for concrete flow. -->
     
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
index de52618..574a98a 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
@@ -207,6 +207,4 @@
         </on-entry>
     </end-state>
 
-    <bean-import resource="sso-abstract-beans.xml" />
-
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-ecp-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-ecp-beans.xml
index 1514107..85f2264 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-ecp-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-ecp-beans.xml
@@ -11,6 +11,8 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <import resource="sso-abstract-beans.xml" />
+
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId="#{T(net.shibboleth.idp.saml.saml2.profile.config.ECPProfileConfiguration).PROFILE_ID}"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-beans.xml
index eb9ee66..186f681 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-beans.xml
@@ -11,6 +11,8 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <import resource="sso-abstract-beans.xml" />
+
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId="#{T(net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration).PROFILE_ID}"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-simplesign-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-simplesign-beans.xml
index 0f82ccf..041675f 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-simplesign-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-simplesign-beans.xml
@@ -11,6 +11,8 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <import resource="sso-abstract-beans.xml" />
+
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId="#{T(net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration).PROFILE_ID}"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-redirect-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-redirect-beans.xml
index 749e1da..7a75dc1 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-redirect-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-redirect-beans.xml
@@ -10,6 +10,8 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
        default-init-method="initialize"
        default-destroy-method="destroy">
+
+    <import resource="sso-abstract-beans.xml" />
     
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-unsolicited-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-unsolicited-beans.xml
index 5dcd2e3..d618431 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-unsolicited-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-unsolicited-beans.xml
@@ -11,6 +11,8 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <import resource="sso-abstract-beans.xml" />
+
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId="#{T(net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration).PROFILE_ID}"

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

More information about the commits mailing list