[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/session-manager.xml idp-conf/src/main/res...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Sep 10 22:39:18 2014
New Revision: 6522

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6522&view=rev
Log:
IDP-224 - Flow to propagate logouts generically.

Added:
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml   (with props)
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/LogoutPropagationFlowDescriptor.java   (with props)
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateLogoutContextForPropagation.java   (with props)
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/SelectLogoutPropagationFlow.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/session-manager.xml
    trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSession.java

Modified: trunk/idp-conf/src/main/resources/conf/session-manager.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/session-manager.xml?rev=6522&r1=6521&r2=6522&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/session-manager.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/session-manager.xml Wed Sep 10 22:39:18 2014
@@ -16,7 +16,7 @@
             </map>
         </property>
     </bean>
-
+    
     <!-- Includes defaults for SAML session types. -->
     <util:map id="shibboleth.SessionTypeProtocolMap" >
         <entry key="#{T(net.shibboleth.idp.saml.session.SAML1SPSession)}">
@@ -27,4 +27,9 @@
         </entry>
     </util:map>
     
+    <!-- Flows that propagate logout to additional services using supported protocols. -->
+    <util:list id="shibboleth.LogoutPropagationFlows">
+        <ref bean="logoutprop/saml2" />
+    </util:list>
+    
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml?rev=6522&r1=6521&r2=6522&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml Wed Sep 10 22:39:18 2014
@@ -36,7 +36,7 @@
             </map>
         </property>
     </bean>
-
+    
     <bean id="shibboleth.SessionManager" class="net.shibboleth.idp.session.impl.StorageBackedSessionManager"
             depends-on="shibboleth.OpenSAMLConfig"
             p:httpServletRequest-ref="shibboleth.HttpServletRequest"
@@ -53,6 +53,15 @@
             p:IDGenerator-ref="shibboleth.SessionIDGenerator"
             p:SPSessionSerializerRegistry-ref="shibboleth.SPSessionSerializerRegistry" />
 
+    <!-- Built-in logout propagation flows. -->
+    
+    <bean id="logoutprop/saml2" class="net.shibboleth.idp.session.LogoutPropagationFlowDescriptor">
+        <property name="activationCondition">
+            <bean class="net.shibboleth.idp.session.LogoutPropagationFlowDescriptor.ActivationCondition"
+                p:sessionType="#{ T(net.shibboleth.idp.saml.session.SAML2SPSession) }" />
+        </property>
+    </bean>
+
     <!-- The import is at the bottom to avoid a depends-on in a user-editable file. -->
     <import resource="../../conf/session-manager.xml" />
 

Modified: trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml?rev=6522&r1=6521&r2=6522&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml Wed Sep 10 22:39:18 2014
@@ -25,6 +25,9 @@
         
         <!-- Proprietary logout flow. -->
         <webflow:flow-location id="profile/Logout" path="../system/flows/logout/logout-flow.xml" />
+
+        <!-- Proprietary logout flow. -->
+        <webflow:flow-location id="profile/PropagateLogout" path="../system/flows/logout/logout-propagation-flow.xml" />
 
         <!-- Abstract flows underpinning SAML profiles. -->
         <webflow:flow-location id="saml.abstract" path="../system/flows/saml/saml-abstract-flow.xml" />

Modified: trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSession.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSession.java?rev=6522&r1=6521&r2=6522&view=diff
==============================================================================

[... 12 lines stripped ...]