Trim values obtained with getTextContent() on any XML node

This change extends the previous one, made for SamlResponse name id,
so that surrounding whitespace is removed for any value obtained from
a XML element where this is indeed the expected behaviour (like in
issuers, audiences, status messages, name ids).

Author: mauromol

core/src/main/java/com/onelogin/saml2/authn/SamlResponse.java

@@ -601,7 +601,11 @@ public HashMap<String, List<String>> getAttributes() throws XPathExpressionExcep
 				}
 				for (int j = 0; j < childrens.getLength(); j++) {
 					if ("AttributeValue".equals(childrens.item(j).getLocalName())) {
-						attrValues.add(childrens.item(j).getTextContent());
+						String attrValue = childrens.item(j).getTextContent();
+						if(attrValue != null) {
+							attrValue = attrValue.toString();
+						}
+						attrValues.add(attrValue);
 					}
 				}
 
@@ -704,8 +708,9 @@ public List<String> getAudiences() throws XPathExpressionException {
 		for (int i = 0; i < entries.getLength(); i++) {
 			if (entries.item(i) != null) {
 				String value = entries.item(i).getTextContent();
-				if(value != null)
+				if(value != null) {
 					value = value.trim();
+				}
 				if(!StringUtils.isEmpty(value)) {
 					audiences.add(value);
 				}
@@ -729,7 +734,11 @@ public String getResponseIssuer() throws XPathExpressionException, ValidationErr
 		NodeList responseIssuer = Util.query(samlResponseDocument, "/samlp:Response/saml:Issuer");
 		if (responseIssuer.getLength() > 0) {
 			if (responseIssuer.getLength() == 1) {
-				return responseIssuer.item(0).getTextContent();
+				String value = responseIssuer.item(0).getTextContent();
+				if(value != null) {
+					value = value.trim();
+				}
+				return value;
 			} else {
 				throw new ValidationError("Issuer of the Response is multiple.", ValidationError.ISSUER_MULTIPLE_IN_RESPONSE);
 			}
@@ -752,7 +761,11 @@ public String getResponseIssuer() throws XPathExpressionException, ValidationErr
 	public String getAssertionIssuer() throws XPathExpressionException, ValidationError {
 		NodeList assertionIssuer = this.queryAssertion("/saml:Issuer");
 		if (assertionIssuer.getLength() == 1) {
-			return assertionIssuer.item(0).getTextContent();
+			String value = assertionIssuer.item(0).getTextContent();
+			if(value != null) {
+				value = value.trim();
+			}
+			return value;
 		} else {
 			throw new ValidationError("Issuer of the Assertion not found or multiple.", ValidationError.ISSUER_NOT_FOUND_IN_ASSERTION);
 		}

core/src/main/java/com/onelogin/saml2/logout/LogoutRequest.java

@@ -586,7 +586,11 @@ public static Map<String, String> getNameIdData(Document samlLogoutRequestDocume
 		Map<String, String> nameIdData = new HashMap<String, String>();
 
 		if (nameIdElem != null) {
-			nameIdData.put("Value", nameIdElem.getTextContent());
+			String value = nameIdElem.getTextContent();
+			if(value != null) {
+				value = value.trim();
+			}
+			nameIdData.put("Value", value);
 
 			if (nameIdElem.hasAttribute("Format")) {
 				nameIdData.put("Format", nameIdElem.getAttribute("Format"));
@@ -702,9 +706,11 @@ public static String getIssuer(Document samlLogoutRequestDocument) throws XPathE
         NodeList nodes = Util.query(samlLogoutRequestDocument, "/samlp:LogoutRequest/saml:Issuer");
 
         if (nodes.getLength() == 1) {
-			issuer = nodes.item(0).getTextContent();
-		}
-
+      	  issuer = nodes.item(0).getTextContent();
+	  }
+        if(issuer != null) {
+      	  issuer = issuer.trim();
+        }
         return issuer;
     }
 
@@ -740,7 +746,11 @@ public static List<String> getSessionIndexes(Document samlLogoutRequestDocument)
         NodeList nodes = Util.query(samlLogoutRequestDocument, "/samlp:LogoutRequest/samlp:SessionIndex");
 
         for (int i = 0; i < nodes.getLength(); i++) {
-        	sessionIndexes.add(nodes.item(i).getTextContent());
+        	String sessionIndex = nodes.item(i).getTextContent();
+        	if(sessionIndex != null) {
+        		sessionIndex = sessionIndex.trim();
+      		sessionIndexes.add(sessionIndex);
+        	}
         }
 
         return sessionIndexes;

core/src/main/java/com/onelogin/saml2/logout/LogoutResponse.java

@@ -299,12 +299,15 @@ public Boolean isValid() {
 	 * @throws XPathExpressionException
 	 */
     public String getIssuer() throws XPathExpressionException {
-    	String issuer = null;
-		NodeList issuers = this.query("/samlp:LogoutResponse/saml:Issuer");
-		if (issuers.getLength() == 1) {
-			issuer = issuers.item(0).getTextContent();
-		}
-        return issuer;
+	    String issuer = null;
+	    NodeList issuers = this.query("/samlp:LogoutResponse/saml:Issuer");
+	    if (issuers.getLength() == 1) {
+		    issuer = issuers.item(0).getTextContent();
+	    }
+	    if (issuer != null) {
+		    issuer = issuer.toString();
+	    }
+	    return issuer;
     }
 
     /**

core/src/main/java/com/onelogin/saml2/util/Util.java

@@ -1647,7 +1647,11 @@ public static SamlResponseStatus getStatus(String statusXpath, Document dom) thr
 
 			NodeList messageEntry = Util.query(dom, statusXpath + "/samlp:StatusMessage", (Element) statusEntry.item(0));
 			if (messageEntry.getLength() == 1) {
-				status.setStatusMessage(messageEntry.item(0).getTextContent());
+				String statusMessage = messageEntry.item(0).getTextContent();
+				if(statusMessage != null) {
+					statusMessage = statusMessage.trim();
+				}
+				status.setStatusMessage(statusMessage);
 			}
 
 			return status;