[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/logout/logout-beans.xml idp-conf/...

[noreply at shibboleth.net]

Author: serac
Date: Fri Oct  2 17:17:45 2015
New Revision: 7795

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7795&view=rev
Log:
IDP-224 Provide UI for logout propagation.

Tweaked existing logout flows and fleshed out how sessions are passed
around from UI to protocol-specific propagation flows. The UI looks up
SPSessions by reference keyed on the SPSession key. The original by-value
passing (serialization+data sealer) is still supported.

Added:
    trunk/idp-conf/src/main/resources/views/logout-complete.vm
    trunk/idp-conf/src/main/resources/views/logout-propagate.vm
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/context/LogoutPropagationContext.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateLogoutPropagationContext.java
      - copied, changed from r7793, trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateLogoutContextForPropagation.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/SaveLogoutContext.java
    trunk/idp-war/src/main/webapp/images/failure-32x32.png   (with props)
    trunk/idp-war/src/main/webapp/images/success-32x32.png   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml
    trunk/idp-conf/src/main/resources/views/logout.vm
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/LogoutPropagationFlowDescriptor.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateLogoutContextForPropagation.java
    trunk/idp-war/src/main/webapp/css/main.css

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml?rev=7795&r1=7794&r2=7795&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml	Fri Oct  2 17:17:45 2015
@@ -117,4 +117,7 @@
         p:defaultView-ref="shibboleth.DefaultErrorView"
         p:eventMap="#{getObject('shibboleth.EventViewMap')}" />
 
+    <bean id="SaveLogoutContext"
+          class="net.shibboleth.idp.session.impl.SaveLogoutContext" />
+
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml?rev=7795&r1=7794&r2=7795&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml	Fri Oct  2 17:17:45 2015
@@ -70,10 +70,43 @@
         
         <transition on="proceed" to="NextRelyingPartyContext" />
     </action-state>
-    
+
+    <view-state id="LogoutView" view="logout">
+        <on-entry>
+            <evaluate expression="WriteAuditLog" />
+            <evaluate expression="environment" result="viewScope.environment" />
+            <evaluate expression="opensamlProfileRequestContext" result="viewScope.profileRequestContext" />
+            <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.session.context.LogoutContext))" result="viewScope.logoutContext" />
+            <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.profile.context.MultiRelyingPartyContext))" result="viewScope.multiRPContext" />
+            <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="viewScope.encoder" />
+            <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="viewScope.request" />
+            <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="viewScope.response" />
+            <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.CustomViewContext')" result="viewScope.custom" />
+        </on-entry>
+        <transition on="propagate" to="LogoutPropagateView" />
+        <transition on="end" to="LogoutCompleteView" />
+    </view-state>
+
     <!-- Terminus -->
 
-    <end-state id="LogoutView" view="logout">
+    <end-state id="LogoutPropagateView" view="logout-propagate">
+        <on-entry>
+            <evaluate expression="SaveLogoutContext" />
+            <evaluate expression="WriteAuditLog" />
+            <evaluate expression="environment" result="requestScope.environment" />

[... 492 lines stripped ...]