Author: anil.saldhana(a)jboss.com Date: 2009-10-26 17:25:37 -0400 (Mon, 26 Oct 2009) New Revision: 872 Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPSAMLDebugValve.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/constants/GeneralConstants.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPLoginServlet.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/PostBindingUtil.java Log: use constants Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-10-26 21:04:11 UTC (rev 871) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-10-26 21:25:37 UTC (rev 872) @@ -284,7 +284,7 @@ private boolean hasSAMLRequestMessage(Request request) { - return request.getParameter("SAMLRequest") != null; + return request.getParameter(GeneralConstants.SAML_REQUEST_KEY) != null; } private RequestAbstractType getSAMLRequest(Request request) throws ParsingException, IOException @@ -443,7 +443,7 @@ private String getSAMLMessage(Request request) { - return request.getParameter("SAMLRequest"); + return request.getParameter(GeneralConstants.SAML_REQUEST_KEY); } //***************Catalina Lifecyle methods Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPSAMLDebugValve.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPSAMLDebugValve.java 2009-10-26 21:04:11 UTC (rev 871) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPSAMLDebugValve.java 2009-10-26 21:25:37 UTC (rev 872) @@ -29,6 +29,7 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.valves.ValveBase; import org.apache.log4j.Logger; +import org.jboss.identity.federation.web.constants.GeneralConstants; /** * Debug Valve on the IDP end that will @@ -46,9 +47,10 @@ throws IOException, ServletException { StringBuilder builder = new StringBuilder(); - String param = request.getParameter("SAMLRequest"); + String param = request.getParameter(GeneralConstants.SAML_REQUEST_KEY); builder.append("Method = " + request.getMethod()).append("\n"); builder.append("SAMLRequest=" + param).append("\n"); + builder.append("SAMLResponse=" + request.getParameter(GeneralConstants.SAML_RESPONSE_KEY)).append("\n"); builder.append("Parameter exists?="+ param != null).append("\n"); String debugInfo = builder.toString(); if(debugEnabled) Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-10-26 21:04:11 UTC (rev 871) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-10-26 21:25:37 UTC (rev 872) @@ -182,8 +182,8 @@ if(isNotNull(relayState)) relayState = RedirectBindingUtil.urlDecode(relayState); - String samlRequestMessage = request.getParameter("SAMLRequest"); - String samlResponseMessage = request.getParameter("SAMLResponse"); + String samlRequestMessage = request.getParameter(GeneralConstants.SAML_REQUEST_KEY); + String samlResponseMessage = request.getParameter(GeneralConstants.SAML_RESPONSE_KEY); String signature = request.getParameter("Signature"); String sigAlg = request.getParameter("SigAlg"); @@ -197,9 +197,9 @@ { if(trace) log.trace("Storing the SAMLRequest/SAMLResponse and RelayState in session"); if(isNotNull(samlRequestMessage)) - session.setNote("SAMLRequest", samlRequestMessage); + session.setNote(GeneralConstants.SAML_REQUEST_KEY, samlRequestMessage); if(isNotNull(samlResponseMessage)) - session.setNote("SAMLResponse", samlResponseMessage); + session.setNote(GeneralConstants.SAML_RESPONSE_KEY, samlResponseMessage); if(isNotNull(relayState)) session.setNote(GeneralConstants.RELAY_STATE, relayState.trim()); if(isNotNull(signature)) @@ -263,9 +263,9 @@ * we can retrieve the original saml message as well as * any relay state from the SP */ - samlRequestMessage = (String) session.getNote("SAMLRequest"); + samlRequestMessage = (String) session.getNote(GeneralConstants.SAML_REQUEST_KEY); - samlResponseMessage = (String) session.getNote("SAMLResponse"); + samlResponseMessage = (String) session.getNote(GeneralConstants.SAML_RESPONSE_KEY); relayState = (String) session.getNote(GeneralConstants.RELAY_STATE); signature = (String) session.getNote("Signature"); sigAlg = (String) session.getNote("sigAlg"); @@ -283,9 +283,9 @@ } if(isNotNull(samlRequestMessage)) - session.removeNote("SAMLRequest"); + session.removeNote(GeneralConstants.SAML_REQUEST_KEY); if(isNotNull(samlResponseMessage)) - session.removeNote("SAMLResponse"); + session.removeNote(GeneralConstants.SAML_RESPONSE_KEY); if(isNotNull(relayState)) session.removeNote(GeneralConstants.RELAY_STATE); Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-10-26 21:04:11 UTC (rev 871) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-10-26 21:25:37 UTC (rev 872) @@ -107,8 +107,8 @@ String gloStr = request.getParameter(GeneralConstants.GLOBAL_LOGOUT); boolean logOutRequest = isNotNull(gloStr) && "true".equalsIgnoreCase(gloStr); - String samlRequest = request.getParameter("SAMLRequest"); - String samlResponse = request.getParameter("SAMLResponse"); + String samlRequest = request.getParameter(GeneralConstants.SAML_REQUEST_KEY); + String samlResponse = request.getParameter(GeneralConstants.SAML_RESPONSE_KEY); Principal principal = request.getUserPrincipal(); Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/constants/GeneralConstants.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/constants/GeneralConstants.java 2009-10-26 21:04:11 UTC (rev 871) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/constants/GeneralConstants.java 2009-10-26 21:25:37 UTC (rev 872) @@ -54,6 +54,9 @@ String ROLE_VALIDATOR = "ROLE_VALIDATOR"; String ROLE_VALIDATOR_IGNORE = "ROLE_VALIDATOR_IGNORE"; + String SAML_REQUEST_KEY = "SAMLRequest"; + String SAML_RESPONSE_KEY = "SAMLResponse"; + String SENDER_PUBLIC_KEY = "SENDER_PUBLIC_KEY"; String SIGN_OUTGOING_MESSAGES = "SIGN_OUTGOING_MESSAGES"; Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java 2009-10-26 21:04:11 UTC (rev 871) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java 2009-10-26 21:25:37 UTC (rev 872) @@ -155,8 +155,8 @@ Principal userPrincipal = (Principal) session.getAttribute(GeneralConstants.PRINCIPAL_ID);; - String samlRequest = request.getParameter("SAMLRequest"); - String samlResponse = request.getParameter("SAMLResponse"); + String samlRequest = request.getParameter(GeneralConstants.SAML_REQUEST_KEY); + String samlResponse = request.getParameter(GeneralConstants.SAML_RESPONSE_KEY); //Eagerly look for Global LogOut String gloStr = request.getParameter(GeneralConstants.GLOBAL_LOGOUT); Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPLoginServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPLoginServlet.java 2009-10-26 21:04:11 UTC (rev 871) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPLoginServlet.java 2009-10-26 21:25:37 UTC (rev 872) @@ -69,7 +69,7 @@ if(username == null || passwd == null) { - String samlMessage = request.getParameter("SAMLRequest"); + String samlMessage = request.getParameter(GeneralConstants.SAML_REQUEST_KEY); if(samlMessage == null || "".equals(samlMessage)) response.sendError(HttpServletResponse.SC_BAD_REQUEST); @@ -145,8 +145,10 @@ private void saveRequest(HttpServletRequest request, HttpSession session) { //Save the SAMLRequest and relayState - session.setAttribute("SAMLRequest", request.getParameter("SAMLRequest")); - session.setAttribute("SAMLResponse", request.getParameter("SAMLResponse")); + session.setAttribute(GeneralConstants.SAML_REQUEST_KEY, + request.getParameter(GeneralConstants.SAML_REQUEST_KEY)); + session.setAttribute(GeneralConstants.SAML_RESPONSE_KEY, + request.getParameter(GeneralConstants.SAML_RESPONSE_KEY)); String relayState = request.getParameter(GeneralConstants.RELAY_STATE); if(relayState != null && !"".equals(relayState)) Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-10-26 21:04:11 UTC (rev 871) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-10-26 21:25:37 UTC (rev 872) @@ -244,8 +244,8 @@ //Some issue with filters and servlets HttpSession session = request.getSession(false); - String samlRequestMessage = (String) session.getAttribute("SAMLRequest"); - String samlResponseMessage = (String) session.getAttribute("SAMLResponse"); + String samlRequestMessage = (String) session.getAttribute(GeneralConstants.SAML_REQUEST_KEY); + String samlResponseMessage = (String) session.getAttribute(GeneralConstants.SAML_RESPONSE_KEY); String relayState = (String) session.getAttribute(GeneralConstants.RELAY_STATE); String referer = request.getHeader("Referer"); @@ -276,8 +276,8 @@ log.trace("saml Request message=" + samlRequestMessage + "::relay state="+ relayState); log.trace("saml Response message=" + samlResponseMessage + "::relay state="+ relayState); } - session.removeAttribute("SAMLRequest"); - session.removeAttribute("SAMLResponse"); + session.removeAttribute(GeneralConstants.SAML_REQUEST_KEY); + session.removeAttribute(GeneralConstants.SAML_RESPONSE_KEY); if(isNotNull(relayState)) session.removeAttribute(GeneralConstants.RELAY_STATE); Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/PostBindingUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/PostBindingUtil.java 2009-10-26 21:04:11 UTC (rev 871) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/PostBindingUtil.java 2009-10-26 21:25:37 UTC (rev 872) @@ -29,6 +29,7 @@ import org.apache.log4j.Logger; import org.jboss.identity.federation.api.util.Base64; import org.jboss.identity.federation.core.saml.v2.holders.DestinationInfoHolder; +import org.jboss.identity.federation.web.constants.GeneralConstants; import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; @@ -66,7 +67,8 @@ boolean request) throws IOException { - String key = request ? "SAMLRequest" : "SAMLResponse"; + String key = request ? GeneralConstants.SAML_REQUEST_KEY + : GeneralConstants.SAML_RESPONSE_KEY; String relayState = holder.getRelayState(); String destination = holder.getDestination();