[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/webflow-config.xml idp-conf/src/ma...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Aug 26 14:05:42 2014
New Revision: 6472

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6472&view=rev
Log:
IDP-224 - Front-channel non-SAML logout flow

Added:
    trunk/idp-conf/src/main/resources/system/flows/logout/
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogout.java   (with props)
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/context/LogoutContext.java   (with props)
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/ProcessLogout.java   (with props)
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/ProcessLogoutTest.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/AuditContext.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SessionManager.java
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp
    trunk/idp-war/src/main/webapp/WEB-INF/web.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=6472&r1=6471&r2=6472&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 Tue Aug 26 14:05:42 2014
@@ -22,6 +22,9 @@
 
         <!-- Status flow. -->
         <webflow:flow-location id="status" path="../system/flows/status/status-flow.xml" />
+        
+        <!-- Proprietary logout flow. -->
+        <webflow:flow-location id="profile/Logout" path="../system/flows/logout/logout-flow.xml" />
 
         <!-- Abstract flows underpinning SAML profiles. -->
         <webflow:flow-location id="saml.abstract" path="../system/flows/saml/saml-abstract-flow.xml" />

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/AuditContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/AuditContext.java?rev=6472&r1=6471&r2=6472&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/AuditContext.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/AuditContext.java Tue Aug 26 14:05:42 2014
@@ -40,7 +40,7 @@
     
     /** Constructor. */
     public AuditContext() {
-        fieldMap = ArrayListMultimap.<String,String>create(20, 1);
+        fieldMap = ArrayListMultimap.create(20, 1);
     }
     
     /**

Modified: trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SessionManager.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SessionManager.java?rev=6472&r1=6471&r2=6472&view=diff
==============================================================================
--- trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SessionManager.java (original)
+++ trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SessionManager.java Tue Aug 26 14:05:42 2014
@@ -50,6 +50,9 @@
      * Invalidates or otherwise removes a session from persistent storage and/or unbinds it
      * from a client.
      * 
+     * <p>After calling this method, no further method calls on a corresponding {@link IdPSession}
+     * object that may be in hand are guaranteed to function correctly. Their behavior is unspecified.</p>
+     * 
      * @param sessionId the unique ID of the session to destroy
      * 
      * @throws SessionException if the session cannot be destroyed

Modified: trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp?rev=6472&r1=6471&r2=6472&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp (original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp Tue Aug 26 14:05:42 2014
@@ -1,4 +1,13 @@
-<html>
+<!DOCTYPE html>
+
+<%@ taglib uri="urn:mace:shibboleth:2.0:idp:ui" prefix="idpui" %>
+<%@ page import="org.opensaml.profile.context.ProfileRequestContext" %>
+<%@ page import="net.shibboleth.utilities.java.support.codec.HTMLEncoder" %>
+<%@ page import="net.shibboleth.idp.session.SPSession" %>
+<%@ page import="net.shibboleth.idp.session.context.LogoutContext" %>
+<%@ page import="net.shibboleth.idp.ui.context.RelyingPartyUIContext" %>
+<%@ page import="org.springframework.webflow.execution.RequestContext" %>
+
 <html>
   <head>
     <meta charset="utf-8" />

[... 60 lines stripped ...]