public-collect/webprofile-ref-project-v3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Restoring the old log method but making an exception for signed and already marshalled messages

Browse Source
This commit is contained in:
srasmusson
2016-08-17 21:39:42 +02:00
parent c7ac194efc
commit 56e07d69ea
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/no/steras/opensamlbook/OpenSAMLUtils.java
View File

@@ -6,20 +6,19 @@ import org.opensaml.core.xml.XMLObjectBuilderFactory;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport; import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.Marshaller; import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException; import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.saml.common.SignableSAMLObject;
import org.opensaml.soap.soap11.Body; import org.opensaml.soap.soap11.Body;
import org.opensaml.soap.soap11.Envelope; import org.opensaml.soap.soap11.Envelope;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element;
import javax.xml.namespace.QName; import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.OutputKeys; import javax.xml.transform.*;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource; import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamResult;
import java.io.StringWriter; import java.io.StringWriter;
@@ -57,18 +56,35 @@ public class OpenSAMLUtils {
} }
public static void logSAMLObject(final XMLObject object) { public static void logSAMLObject(final XMLObject object) {
Element element = null;
if (object instanceof SignableSAMLObject && ((SignableSAMLObject)object).isSigned() && object.getDOM() != null) {
element = object.getDOM();
} else {
try {
Marshaller out = XMLObjectProviderRegistrySupport.getMarshallerFactory().getMarshaller(object);
out.marshall(object);
element = object.getDOM();
} catch (MarshallingException e) {
logger.error(e.getMessage(), e);
}
}
try { try {
Transformer transformer = TransformerFactory.newInstance().newTransformer(); Transformer transformer = TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperty(OutputKeys.INDENT, "yes"); transformer.setOutputProperty(OutputKeys.INDENT, "yes");
StreamResult result = new StreamResult(new StringWriter()); StreamResult result = new StreamResult(new StringWriter());
DOMSource source = new DOMSource(object.getDOM()); DOMSource source = new DOMSource(element);
transformer.transform(source, result); transformer.transform(source, result);
String xmlString = result.getWriter().toString(); String xmlString = result.getWriter().toString();
logger.info(xmlString); logger.info(xmlString);
} catch (TransformerConfigurationException e) {
e.printStackTrace();
} catch (TransformerException e) { } catch (TransformerException e) {
logger.error(e.getMessage(), e); e.printStackTrace();
} }
} }
} }