libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Merge pull request #4173 from hmlnarik/KEYCLOAK-4941

Browse source 
KEYCLOAK-4941
This commit is contained in:
Stian Thorgersen 2017-05-23 14:00:43 +02:00 committed by GitHub
commit 1b6405a28f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/src/main/java/org/keycloak/broker/saml/SAMLDataMarshaller.java
View file

@ -21,6 +21,7 @@ import org.keycloak.broker.provider.DefaultDataMarshaller;
import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AssertionType;
import org.keycloak.dom.saml.v2.assertion.AuthnStatementType; import org.keycloak.dom.saml.v2.assertion.AuthnStatementType;
import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.dom.saml.v2.protocol.ResponseType;
import org.keycloak.saml.common.constants.GeneralConstants;
import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.exceptions.ParsingException;
import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.exceptions.ProcessingException;
import org.keycloak.saml.common.util.StaxUtil; import org.keycloak.saml.common.util.StaxUtil;
@ -66,7 +67,7 @@ public class SAMLDataMarshaller extends DefaultDataMarshaller {
throw new RuntimeException(pe); throw new RuntimeException(pe);
} }
return new String(bos.toByteArray()); return new String(bos.toByteArray(), GeneralConstants.SAML_CHARSET);
} else { } else {
return super.serialize(obj); return super.serialize(obj);
} }
@ -79,12 +80,12 @@ public class SAMLDataMarshaller extends DefaultDataMarshaller {
try { try {
if (clazz.equals(ResponseType.class) || clazz.equals(AssertionType.class)) { if (clazz.equals(ResponseType.class) || clazz.equals(AssertionType.class)) {
byte[] bytes = xmlString.getBytes(); byte[] bytes = xmlString.getBytes(GeneralConstants.SAML_CHARSET);
InputStream is = new ByteArrayInputStream(bytes); InputStream is = new ByteArrayInputStream(bytes);
Object respType = new SAMLParser().parse(is); Object respType = new SAMLParser().parse(is);
return clazz.cast(respType); return clazz.cast(respType);
} else if (clazz.equals(AuthnStatementType.class)) { } else if (clazz.equals(AuthnStatementType.class)) {
byte[] bytes = xmlString.getBytes(); byte[] bytes = xmlString.getBytes(GeneralConstants.SAML_CHARSET);
InputStream is = new ByteArrayInputStream(bytes); InputStream is = new ByteArrayInputStream(bytes);
XMLEventReader xmlEventReader = new SAMLParser().createEventReader(is); XMLEventReader xmlEventReader = new SAMLParser().createEventReader(is);
AuthnStatementType authnStatement = SAMLParserUtil.parseAuthnStatement(xmlEventReader); AuthnStatementType authnStatement = SAMLParserUtil.parseAuthnStatement(xmlEventReader);