[java-shib-idp2 COMMIT] /branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SLOProfil...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb  3 16:06:12 2014
New Revision: 3179

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3179&view=rev
Log:
SIDP-600: expose message context to JSP template

Modified:
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SLOProfileHandler.java

Modified: branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SLOProfileHandler.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SLOProfileHandler.java?rev=3179&r1=3178&r2=3179&view=diff
==============================================================================
--- branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SLOProfileHandler.java (original)
+++ branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SLOProfileHandler.java Mon Feb  3 16:06:12 2014
@@ -73,6 +73,9 @@
     
     /** Name of attribute for tracking logged out session. */
     public static final String HTTP_LOGOUT_BINDING_ATTRIBUTE = "ShibbolethLogoutSession";
+
+    /** Name of attribute for accessing the SLORequestContext. */
+    public static final String HTTP_LOGOUT_REQUEST_CONTEXT_ATTRIBUTE = "ShibbolethLogoutRequestContext";
         
     /** Canned SOAP fault. */
     private final String soapFaultResponseMessage =
@@ -149,7 +152,7 @@
     public void processRequest(HTTPInTransport inTransport, HTTPOutTransport outTransport) throws ProfileException {
         if (getInboundBinding().equals(LOCAL_LOGOUT_BINDING)) {
             log.debug("Processing logout request");
-            localLogout(null, inTransport, outTransport);
+            localLogout(null, inTransport, outTransport, null);
         } else {
             log.debug("Processing incoming SAML LogoutRequest");
             processLogoutRequest(inTransport, outTransport);
@@ -165,7 +168,7 @@
      * @param outTransport  outgoing transport object
      * @throws ProfileException if an error occurs during profile execution
      */
-    protected void localLogout(Session indirect, HTTPInTransport inTransport, HTTPOutTransport outTransport)
+    protected void localLogout(Session indirect, HTTPInTransport inTransport, HTTPOutTransport outTransport, SLORequestContext requestContext)
         throws ProfileException {
 
         // Context info for template.
@@ -214,6 +217,7 @@
                     (templatePath.startsWith("/") ? templatePath : "/" + templatePath));
             try {
                 request.setAttribute(HTTP_LOGOUT_BINDING_ATTRIBUTE, (activeSession != null) ? activeSession : indirect);
+                request.setAttribute(HTTP_LOGOUT_REQUEST_CONTEXT_ATTRIBUTE, requestContext);
                 dispatcher.forward(request, response);
             } catch (Exception e) {
                 throw new ProfileException("Could not dispatch to JSP page.", e);
@@ -317,7 +321,7 @@
                         log.error("Error returning empty response.", we);
                      }
                 } else {
-                    localLogout(indexedSession, inTransport, outTransport);
+                    localLogout(indexedSession, inTransport, outTransport, requestContext);
                 }
                 writeAuditLogEntry(requestContext);
                 return;