Merge pull request #92 from rembjo0/topic-encoding

Adds UTF-8 encoding when converting bytes to string
SAML-Toolkits · Feb 2, 2017 · 560d41d · 560d41d
2 parents 26def30 + cb24c1b
commit 560d41d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/core/src/main/java/com/onelogin/saml2/authn/SamlResponse.java b/core/src/main/java/com/onelogin/saml2/authn/SamlResponse.java
@@ -120,7 +120,7 @@ public SamlResponse(Saml2Settings settings, HttpRequest request) throws XPathExp
 	 * @throws ValidationError
 	 */
 	public void loadXmlFromBase64(String responseStr) throws ParserConfigurationException, XPathExpressionException, SAXException, IOException, SettingsException, ValidationError {
-		samlResponseString = new String(Util.base64decoder(responseStr));
+		samlResponseString = new String(Util.base64decoder(responseStr), "UTF-8");
 		samlResponseDocument = Util.loadXML(samlResponseString);
 
 		if (samlResponseDocument == null) {

diff --git a/core/src/main/java/com/onelogin/saml2/util/Util.java b/core/src/main/java/com/onelogin/saml2/util/Util.java
@@ -329,7 +329,16 @@ public static String convertDocumentToString(Document doc, Boolean c14n) {
 		} else {
 			XMLUtils.outputDOM(doc, baos);
 		}
-		return baos.toString();
+
+		return Util.toUtf8String(baos.toByteArray());
+	}
+
+	private static String toUtf8String(byte[] bytes) {
+		try {
+			return new String(bytes, "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			throw new IllegalStateException(e);
+		}
 	}
 
 	/**