[jboss-identity-commits] JBoss Identity SVN: r868 - in identity-federation/trunk: jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp and 6 other directories.

Author: anil.saldhana(a)jboss.com Date: 2009-10-22 00:50:43 -0400 (Thu, 22 Oct 2009) New Revision: 868 Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/StringUtil.java Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java 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/IDPRedirectWithSignatureValve.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/SPPostFormAuthenticator.java 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/SPRedirectSignatureFormAuthenticator.java identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.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/IDPServlet.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java 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/RedirectBindingSignatureUtil.java Log: string util Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java 2009-10-22 04:12:47 UTC (rev 867) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java 2009-10-22 04:50:43 UTC (rev 868) @@ -43,6 +43,9 @@ import org.jboss.identity.federation.core.saml.v2.metadata.store.IMetadataConfigurationStore; import org.jboss.identity.federation.saml.v2.metadata.EntityDescriptorType; + +import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; + /** * Circle of trust establishing servlet that accesses * the metadata urls of the various sites and updates @@ -62,7 +65,7 @@ super.init(config); String cstr = config.getInitParameter("configProvider"); - if(cstr != null && cstr.length() > 0) + if(isNotNull(cstr)) { ClassLoader tcl; try Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java 2009-10-22 04:12:47 UTC (rev 867) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java 2009-10-22 04:50:43 UTC (rev 868) @@ -55,6 +55,9 @@ import org.jboss.identity.federation.web.util.ConfigurationUtil; import org.jboss.identity.xmlsec.w3.xmldsig.KeyInfoType; + +import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; + /** * Metadata servlet for the IDP/SP * @author Anil.Saldhana(a)redhat.com @@ -86,7 +89,7 @@ { ServletContext context = config.getServletContext(); String configL = config.getInitParameter("configFile"); - if(configL != null && configL.length() > 0) + if(isNotNull(configL)) configFileLocation = configL; if(trace) log.trace("Config File Location="+ configFileLocation); @@ -120,7 +123,7 @@ * It may be difficult to get to the resource from the TCL. */ String fileInjectionStr = metadataProvider.requireFileInjection(); - if(fileInjectionStr != null && fileInjectionStr.length() > 0) + if(isNotNull(fileInjectionStr)) { metadataProvider.injectFileStream(context.getResourceAsStream(fileInjectionStr)); } 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-22 04:12:47 UTC (rev 867) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-10-22 04:50:43 UTC (rev 868) @@ -69,6 +69,8 @@ import org.jboss.identity.federation.web.util.RedirectBindingUtil; import org.xml.sax.SAXException; +import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; + /** * Valve at the IDP that supports the HTTP/Redirect Binding * @author Anil.Saldhana(a)redhat.com @@ -232,7 +234,7 @@ String destination = responseType.getDestination(); if(trace) log.trace("IDP:Destination=" + destination); - if(relayState != null && relayState.length() > 0) + if(isNotNull(relayState)) relayState = RedirectBindingUtil.urlEncode(relayState); String finalDest = destination + this.getDestination(urlEncodedResponse, relayState); @@ -263,7 +265,7 @@ { StringBuilder sb = new StringBuilder(); sb.append("?SAMLResponse=").append(urlEncodedResponse); - if(urlEncodedRelayState != null && urlEncodedRelayState.length() > 0) + if(isNotNull(urlEncodedRelayState)) sb.append("&RelayState=").append(urlEncodedRelayState); return sb.toString(); } Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java 2009-10-22 04:12:47 UTC (rev 867) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java 2009-10-22 04:50:43 UTC (rev 868) @@ -61,6 +61,9 @@ import org.xml.sax.SAXException; +import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; + + /** * Valve at the Identity Provider that supports * SAML2 HTTP/Redirect binding with digital signature support @@ -89,7 +92,7 @@ */ public void setIgnoreSignature(String val) { - if(val != null && val.length() > 0) + if(isNotNull(val)) this.ignoreSignature = Boolean.valueOf(val); } 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-22 04:12:47 UTC (rev 867) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-10-22 04:50:43 UTC (rev 868) @@ -88,6 +88,9 @@ import org.jboss.identity.federation.web.util.RedirectBindingUtil; import org.w3c.dom.Document; +import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; + + /** * Generic Web Browser SSO valve for the IDP * @@ -185,8 +188,8 @@ String signature = request.getParameter("Signature"); String sigAlg = request.getParameter("SigAlg"); - boolean containsSAMLRequestMessage = this.isNotNull(samlRequestMessage); - boolean containsSAMLResponseMessage = this.isNotNull(samlResponseMessage); + boolean containsSAMLRequestMessage = isNotNull(samlRequestMessage); + boolean containsSAMLResponseMessage = isNotNull(samlResponseMessage); Session session = request.getSessionInternal(); @@ -284,12 +287,12 @@ if(isNotNull(samlResponseMessage)) session.removeNote("SAMLResponse"); - if(relayState != null && relayState.length() > 0) + if(isNotNull(relayState)) session.removeNote("RelayState"); - if(signature != null && signature.length() > 0) + if(isNotNull(signature)) session.removeNote("Signature"); - if(sigAlg != null && sigAlg.length() > 0) + if(isNotNull(sigAlg)) session.removeNote("sigAlg"); boolean willSendRequest = false; @@ -659,7 +662,7 @@ String queryString, SessionHolder holder, boolean isPost) throws IOException, GeneralSecurityException { - if (holder.samlRequest == null || holder.samlRequest.length() == 0) + if (!isNotNull(holder.samlRequest)) { return false; } @@ -667,7 +670,7 @@ if (!this.ignoreIncomingSignatures && !isPost) { String sig = holder.signature; - if (sig == null || sig.length() == 0) + if (!isNotNull(sig)) { log.error("Signature received from SP is null:" + remoteAddress); return false; @@ -895,9 +898,4 @@ */ response.recycle(); } - - private boolean isNotNull(String str) - { - return str != null && !"".equals(str); - } } \ No newline at end of file Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2009-10-22 04:12:47 UTC (rev 867) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2009-10-22 04:50:43 UTC (rev 868) @@ -58,6 +58,9 @@ import org.jboss.identity.federation.web.util.ServerDetector; import org.xml.sax.SAXException; + +import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; + /** * Authenticator at the Service Provider * that handles HTTP/Post binding of SAML 2 @@ -181,7 +184,7 @@ { StringBuilder sb = new StringBuilder(); sb.append("?SAMLRequest=").append(urlEncodedRequest); - if(urlEncodedRelayState != null && urlEncodedRelayState.length() > 0) + if(isNotNull(urlEncodedRelayState)) sb.append("&RelayState=").append(urlEncodedRelayState); return sb.toString(); } @@ -222,7 +225,7 @@ Principal userPrincipal = null; String samlResponse = request.getParameter("SAMLResponse"); - if(samlResponse != null && samlResponse.length() > 0 ) + if(isNotNull(samlResponse) ) { boolean isValid = false; try 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-22 04:12:47 UTC (rev 867) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-10-22 04:50:43 UTC (rev 868) @@ -21,6 +21,8 @@ */ package org.jboss.identity.federation.bindings.tomcat.sp; +import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -44,8 +46,6 @@ import org.apache.log4j.Logger; import org.jboss.identity.federation.api.saml.v2.request.SAML2Request; import org.jboss.identity.federation.api.saml.v2.response.SAML2Response; -import org.jboss.identity.federation.api.util.Base64; -import org.jboss.identity.federation.api.util.DeflateUtil; import org.jboss.identity.federation.bindings.tomcat.sp.holder.ServiceProviderSAMLContext; import org.jboss.identity.federation.bindings.util.ValveUtil; import org.jboss.identity.federation.core.config.TrustType; @@ -65,7 +65,6 @@ import org.jboss.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest.GENERATE_REQUEST_TYPE; import org.jboss.identity.federation.core.saml.v2.util.DocumentUtil; import org.jboss.identity.federation.saml.v2.SAML2Object; -import org.jboss.identity.federation.saml.v2.assertion.EncryptedElementType; import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType; import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType; import org.jboss.identity.federation.saml.v2.protocol.ResponseType; @@ -487,7 +486,7 @@ sb.append("?SAMLRequest=").append(urlEncodedRequest); else sb.append("?SAMLResponse=").append(urlEncodedRequest); - if(urlEncodedRelayState != null && urlEncodedRelayState.length() > 0) + if(isNotNull(urlEncodedRelayState)) sb.append("&RelayState=").append(urlEncodedRelayState); return sb.toString(); } @@ -537,50 +536,4 @@ { throw new RuntimeException("This authenticator does not handle encryption"); } - - private Principal process(Request request, Response response) - throws IOException, GeneralSecurityException, - ConfigurationException, ParsingException - { - Principal userPrincipal = null; - - String samlResponse = request.getParameter("SAMLResponse"); - if(samlResponse != null && samlResponse.length() > 0 ) - { - boolean isValid = this.validate(request); - - if(!isValid) - throw new GeneralSecurityException("Validity Checks failed"); - - //deal with SAML response from IDP - byte[] base64DecodedResponse = Base64.decode(samlResponse); - InputStream is = DeflateUtil.decode(base64DecodedResponse); - - SAML2Response saml2Response = new SAML2Response(); - - ResponseType responseType = saml2Response.getResponseType(is); - - this.isTrusted(responseType.getIssuer().getValue()); - - List<Object> assertions = responseType.getAssertionOrEncryptedAssertion(); - if(assertions.size() == 0) - throw new IllegalStateException("No assertions in reply from IDP"); - - Object assertion = assertions.get(0); - if(assertion instanceof EncryptedElementType) - { - responseType = this.decryptAssertion(responseType); - } - - SPUtil spUtil = new SPUtil(); - return spUtil.handleSAMLResponse(request, responseType); - } - return userPrincipal; - } - - - private boolean isNotNull(String str) - { - return str != null && !"".equals(str); - } } \ No newline at end of file Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java 2009-10-22 04:12:47 UTC (rev 867) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java 2009-10-22 04:50:43 UTC (rev 868) @@ -50,6 +50,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; + +import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; + /** * Tomcat Authenticator for the HTTP/Redirect binding with Signature support * @author Anil.Saldhana(a)redhat.com @@ -116,7 +119,7 @@ StringBuilder sb = new StringBuilder(); sb.append("SAMLResponse=").append(reqFromURL); - if(relayStateFromURL != null && relayStateFromURL.length() > 0) + if(isNotNull(relayStateFromURL)) { sb.append("&RelayState=").append(relayStateFromURL); } Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java 2009-10-22 04:12:47 UTC (rev 867) +++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java 2009-10-22 04:50:43 UTC (rev 868) @@ -29,6 +29,8 @@ import org.jboss.identity.xmlsec.w3.xmldsig.KeyInfoType; import org.jboss.identity.xmlsec.w3.xmlenc.EncryptionMethodType; +import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; + /** * MetaDataBuilder for the KeyDescriptor * @author Anil.Saldhana(a)redhat.com @@ -53,7 +55,7 @@ KeyDescriptorType keyDescriptor = getObjectFactory().createKeyDescriptorType(); - if(algorithm != null && algorithm.length() > 0) + if(isNotNull(algorithm)) { EncryptionMethodType encryptionMethod = new EncryptionMethodType(); encryptionMethod.setAlgorithm(algorithm); Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/StringUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/StringUtil.java (rev 0) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/StringUtil.java 2009-10-22 04:50:43 UTC (rev 868) @@ -0,0 +1,40 @@ +/* + * 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.core.util; + +/** + * Utility dealing with Strings + * @author Anil.Saldhana(a)redhat.com + * @since Oct 21, 2009 + */ +public class StringUtil +{ + /** + * Check whether the passed string is null or empty + * @param str + * @return + */ + public static boolean isNotNull(String str) + { + return str != null && !"".equals(str); + } +} \ No newline at end of file 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-22 04:12:47 UTC (rev 867) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/filters/SPFilter.java 2009-10-22 04:50:43 UTC (rev 868) @@ -108,6 +108,8 @@ import org.w3c.dom.Document; import org.xml.sax.SAXException; +import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; + /** * A service provider filter for web container agnostic * providers @@ -255,7 +257,7 @@ } //See if we got a response from IDP - if(samlResponse != null && samlResponse.length() > 0 ) + if(isNotNull(samlResponse)) { boolean isValid = false; try @@ -732,9 +734,4 @@ } return principal; } - - private boolean isNotNull(String str) - { - return str != null && !"".equals(str); - } } \ No newline at end of file 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-22 04:12:47 UTC (rev 867) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-10-22 04:50:43 UTC (rev 868) @@ -82,6 +82,9 @@ import org.jboss.identity.federation.web.util.RedirectBindingSignatureUtil; import org.w3c.dom.Document; + +import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; + /** * SAML Web Browser SSO - POST binding * @author Anil.Saldhana(a)redhat.com @@ -276,7 +279,7 @@ session.removeAttribute("SAMLRequest"); session.removeAttribute("SAMLResponse"); - if(relayState != null && relayState.length() > 0) + if(isNotNull(relayState)) session.removeAttribute("RelayState"); SAMLDocumentHolder samlDocumentHolder = null; Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java 2009-10-22 04:12:47 UTC (rev 867) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java 2009-10-22 04:50:43 UTC (rev 868) @@ -67,6 +67,8 @@ import org.w3c.dom.Document; import org.xml.sax.SAXException; +import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; + /** * Request Util * <b> Not thread safe</b> @@ -355,7 +357,7 @@ if(trace) log.trace("IDP:Destination=" + destination); - if(relayState != null && relayState.length() > 0) + if(isNotNull(relayState)) relayState = RedirectBindingUtil.urlEncode(relayState); String finalDest = destination + getDestination(urlEncodedResponse, relayState, @@ -402,7 +404,7 @@ sb.append("?SAMLRequest=").append(urlEncodedResponse); else sb.append("?SAMLResponse=").append(urlEncodedResponse); - if (urlEncodedRelayState != null && urlEncodedRelayState.length() > 0) + if (isNotNull(urlEncodedRelayState)) sb.append("&RelayState=").append(urlEncodedRelayState); } return sb.toString(); 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-22 04:12:47 UTC (rev 867) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/PostBindingUtil.java 2009-10-22 04:50:43 UTC (rev 868) @@ -30,6 +30,9 @@ import org.jboss.identity.federation.api.util.Base64; import org.jboss.identity.federation.core.saml.v2.holders.DestinationInfoHolder; + +import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; + /** * Utility for the HTTP/Post binding * @author Anil.Saldhana(a)redhat.com @@ -90,7 +93,7 @@ builder.append("<FORM METHOD=\"POST\" ACTION=\"" + destination + "\">"); builder.append("<INPUT TYPE=\"HIDDEN\" NAME=\""+ key +"\"" + " VALUE=\"" + samlMessage + "\"/>"); - if (relayState != null && relayState.length() > 0) + if (isNotNull(relayState)) { builder.append("<INPUT TYPE=\"HIDDEN\" NAME=\"RelayState\" " + "VALUE=\"" + relayState + "\"/>"); Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/RedirectBindingSignatureUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/RedirectBindingSignatureUtil.java 2009-10-22 04:12:47 UTC (rev 867) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/RedirectBindingSignatureUtil.java 2009-10-22 04:50:43 UTC (rev 868) @@ -45,6 +45,8 @@ import org.jboss.identity.federation.saml.v2.protocol.ResponseType; import org.w3c.dom.Document; import org.xml.sax.SAXException; + +import static org.jboss.identity.federation.core.util.StringUtil.isNotNull; /** @@ -78,7 +80,7 @@ String urlEncodedRequest = RedirectBindingUtil.deflateBase64URLEncode(sw.toString()); String urlEncodedRelayState = null; - if(relayState != null && relayState.length() > 0 ) + if(isNotNull(relayState)) urlEncodedRelayState = URLEncoder.encode(relayState, "UTF-8"); byte[] sigValue = computeSignature("SAMLRequest=" + urlEncodedRequest, urlEncodedRelayState, signingKey); @@ -134,7 +136,7 @@ String urlEncodedResponse = RedirectBindingUtil.deflateBase64URLEncode(responseString); String urlEncodedRelayState = null; - if(relayState != null && relayState.length() > 0 ) + if(isNotNull(relayState)) urlEncodedRelayState = URLEncoder.encode(relayState, "UTF-8"); byte[] sigValue = computeSignature("SAMLResponse=" + urlEncodedResponse, urlEncodedRelayState, signingKey); @@ -230,7 +232,7 @@ StringBuilder sb = new StringBuilder(); sb.append("SAMLRequest=").append(reqFromURL); - if(relayStateFromURL != null && relayStateFromURL.length() > 0) + if(isNotNull(relayStateFromURL)) { sb.append("&RelayState=").append(relayStateFromURL); } @@ -248,7 +250,7 @@ { StringBuilder sb = new StringBuilder(); sb.append(requestOrResponseKeyValuePair); - if(urlEncodedRelayState != null && urlEncodedRelayState.length() > 0) + if(isNotNull(urlEncodedRelayState)) { sb.append("&RelayState=").append(urlEncodedRelayState); } @@ -271,7 +273,7 @@ { StringBuilder sb = new StringBuilder(); sb.append("SAMLRequest=").append(urlEncodedRequest); - if(urlEncodedRelayState != null && urlEncodedRelayState.length() > 0) + if(isNotNull(urlEncodedRelayState)) { sb.append("&").append("RelayState=").append(urlEncodedRelayState); } @@ -296,7 +298,7 @@ { StringBuilder sb = new StringBuilder(); sb.append("SAMLResponse=").append(urlEncodedResponse); - if(urlEncodedRelayState != null && urlEncodedRelayState.length() > 0) + if(isNotNull(urlEncodedRelayState)) { sb.append("&").append("RelayState=").append(urlEncodedRelayState); }