[java-shib-common COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt pom.xml src/main/java/edu/internet2/middleware/sh...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 22 17:04:02 2011
New Revision: 1012

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1012&view=rev
Log:
SC-169: Set content-type and caching headers for error responses.

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/pom.xml
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/VelocityErrorHandler.java

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/doc/RELEASE-NOTES.txt?rev=1012&r1=1011&r2=1012&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Thu Dec 22 17:04:02 2011
@@ -1,3 +1,7 @@
+Changes in Release 1.3.5
+=============================================
+[SC-169] - Velocity ErrorHandler doesn't set Content-Type of response
+
 Changes in Release 1.3.4
 =============================================
 [SC-162] - Attribute value added multiple times to retained value set if multiple policies permit the same values

Modified: branches/REL_1/pom.xml
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/pom.xml?rev=1012&r1=1011&r2=1012&view=diff
==============================================================================
--- branches/REL_1/pom.xml (original)
+++ branches/REL_1/pom.xml Thu Dec 22 17:04:02 2011
@@ -12,7 +12,7 @@
 
     <groupId>edu.internet2.middleware</groupId>
     <artifactId>shibboleth-common</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <packaging>jar</packaging>
 
     <name>Shibboleth Common Library</name>

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/VelocityErrorHandler.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/VelocityErrorHandler.java?rev=1012&r1=1011&r2=1012&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/VelocityErrorHandler.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/VelocityErrorHandler.java Thu Dec 22 17:04:02 2011
@@ -20,6 +20,8 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
@@ -27,6 +29,7 @@
 import org.opensaml.ws.transport.InTransport;
 import org.opensaml.ws.transport.OutTransport;
 import org.opensaml.ws.transport.http.HttpServletRequestAdapter;
+import org.opensaml.ws.transport.http.HttpServletResponseAdapter;
 import org.opensaml.xml.util.DatatypeHelper;
 import org.owasp.esapi.ESAPI;
 import org.slf4j.Logger;
@@ -103,6 +106,12 @@
         context.put("requestError", in.getAttribute(AbstractErrorHandler.ERROR_KEY));
         context.put("encoder", ESAPI.encoder());
 
+        HttpServletResponse response = ((HttpServletResponseAdapter) out).getWrappedResponse();
+        response.setContentType("text/html");
+        response.setHeader("Cache-Control", "content=\"no-store,no-cache,must-revalidate\"");
+        response.setHeader("Pragma","no-cache");
+        response.setHeader("Expires","-1");
+
         try {
             OutputStreamWriter responseWriter = new OutputStreamWriter(out.getOutgoingStream());
             Template template = velocityEngine.getTemplate(templatePath);