Author: anil.saldhana(a)jboss.com Date: 2008-12-15 21:23:36 -0500 (Mon, 15 Dec 2008) New Revision: 165 Added: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/HTTPRedirectUtil.java Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectValve.java Log: refactored util class Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2008-12-15 18:10:32 UTC (rev 164) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2008-12-16 02:23:36 UTC (rev 165) @@ -46,6 +46,7 @@ import org.jboss.identity.federation.api.saml.v2.factories.JBossSAMLBaseFactory; import org.jboss.identity.federation.api.util.Base64; import org.jboss.identity.federation.api.util.DeflateUtil; +import org.jboss.identity.federation.bindings.util.HTTPRedirectUtil; import org.jboss.identity.federation.saml.v2.assertion.AssertionType; import org.jboss.identity.federation.saml.v2.assertion.AttributeStatementType; import org.jboss.identity.federation.saml.v2.assertion.AttributeType; @@ -118,7 +119,8 @@ String destination = responseType.getDestination(); log.trace("IDP:Destination=" + destination); base64Response = URLEncoder.encode(base64Response, "UTF-8"); - response.sendRedirect(destination + "?SAMLResponse=" + base64Response); + + HTTPRedirectUtil.sendRedirect(destination + "?SAMLResponse=" + base64Response,response); } catch (Exception e) { Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2008-12-15 18:10:32 UTC (rev 164) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2008-12-16 02:23:36 UTC (rev 165) @@ -47,6 +47,7 @@ import org.jboss.identity.federation.api.saml.v2.factories.JBossSAMLBaseFactory; import org.jboss.identity.federation.api.util.Base64; import org.jboss.identity.federation.api.util.DeflateUtil; +import org.jboss.identity.federation.bindings.util.HTTPRedirectUtil; import org.jboss.identity.federation.saml.v2.assertion.AssertionType; import org.jboss.identity.federation.saml.v2.assertion.AttributeStatementType; import org.jboss.identity.federation.saml.v2.assertion.AttributeType; @@ -157,10 +158,8 @@ base64Request = URLEncoder.encode(base64Request, "UTF-8"); String destination = authnRequest.getDestination() + "?SAMLRequest=" + base64Request; log.debug("Sending to destination="+destination); - response.setCharacterEncoding("UTF-8"); - response.setHeader("Location", destination); - response.setStatus(Response.SC_MOVED_TEMPORARILY); - response.sendRedirect(destination); + + HTTPRedirectUtil.sendRedirect(destination, response); return; } Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectValve.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectValve.java 2008-12-15 18:10:32 UTC (rev 164) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectValve.java 2008-12-16 02:23:36 UTC (rev 165) @@ -45,6 +45,7 @@ import org.jboss.identity.federation.api.saml.v2.factories.JBossSAMLBaseFactory; import org.jboss.identity.federation.api.util.Base64; import org.jboss.identity.federation.api.util.DeflateUtil; +import org.jboss.identity.federation.bindings.util.HTTPRedirectUtil; import org.jboss.identity.federation.saml.v2.assertion.AssertionType; import org.jboss.identity.federation.saml.v2.assertion.AttributeStatementType; import org.jboss.identity.federation.saml.v2.assertion.AttributeType; @@ -149,10 +150,8 @@ String destination = authnRequest.getDestination() + "?SAMLRequest=" + base64Request; log.trace("Sending to destination="+destination); log.trace(" "); - response.setCharacterEncoding("UTF-8"); - response.setHeader("Location", destination); - response.setStatus(Response.SC_MOVED_TEMPORARILY); - response.sendRedirect(destination); + + HTTPRedirectUtil.sendRedirect(destination, response); return; } } Added: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/HTTPRedirectUtil.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/HTTPRedirectUtil.java (rev 0) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/HTTPRedirectUtil.java 2008-12-16 02:23:36 UTC (rev 165) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.identity.federation.bindings.util; + +import java.io.IOException; + +import javax.servlet.http.HttpServletResponse; + + +/** + * Utility Class for http/redirect + * @author Anil.Saldhana(a)redhat.com + * @since Dec 15, 2008 + */ +public class HTTPRedirectUtil +{ + public static void sendRedirect(String destination, HttpServletResponse response) + throws IOException + { + response.setCharacterEncoding("UTF-8"); + response.setHeader("Location", destination); + response.setHeader("Cache-Control", "no-cache, no-store"); + response.setHeader("Pragma", "no-cache"); + + response.setStatus(HttpServletResponse.SC_MOVED_TEMPORARILY); + response.sendRedirect(destination); + } +} \ No newline at end of file