Removed xml header from tests

tls-attacker · Jun 1, 2018 · 26c6b0c · 26c6b0c
1 parent 5a3a46c
commit 26c6b0c
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 52 deletions.
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/WorkflowTraceSerializer.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/WorkflowTraceSerializer.java
@@ -28,7 +28,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
-import javax.imageio.IIOException;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
@@ -37,6 +36,7 @@
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactoryConfigurationException;
@@ -115,7 +115,16 @@ public static void write(OutputStream outputStream, WorkflowTrace workflowTrace)
         context = getJAXBContext();
         Marshaller m = context.createMarshaller();
         m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-        m.marshal(workflowTrace, outputStream);
+        ByteArrayOutputStream tempStream = new ByteArrayOutputStream();
+
+        m.marshal(workflowTrace, tempStream);
+        try {
+            outputStream.write(XMLPrettyPrinter.prettyPrintXML(new String(tempStream.toByteArray())).getBytes());
+        } catch (TransformerException | XPathExpressionException | XPathFactoryConfigurationException
+                | ParserConfigurationException | SAXException ex) {
+            throw new RuntimeException("Could not format XML");
+        }
+        tempStream.close();
         outputStream.close();
     }
 

diff --git a/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/WorkflowTraceSerializerTest.java b/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/WorkflowTraceSerializerTest.java
@@ -121,7 +121,7 @@ public void serializeWithSingleConnectionTest() {
             action = new SendAction(new ClientHelloMessage(config));
             trace.addTlsAction(action);
 
-            StringBuilder sb = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n");
+            StringBuilder sb = new StringBuilder();
             sb.append("<workflowTrace>\n");
             sb.append("    <Send>\n");
             sb.append("        <messages>\n");
@@ -164,7 +164,7 @@ public void serializeWithSingleCustomConnectionTest() {
             action.setConnectionAlias(con.getAlias());
             trace.addTlsAction(action);
 
-            StringBuilder sb = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n");
+            StringBuilder sb = new StringBuilder("");
             sb.append("<workflowTrace>\n");
             sb.append("    <OutboundConnection>\n");
             sb.append("        <alias>theAlias</alias>\n");
@@ -214,7 +214,7 @@ public void serializeWithMultipleCustomConnectionTest() {
             action = new SendAction(con3.getAlias(), new ClientHelloMessage(config));
             trace.addTlsAction(action);
 
-            StringBuilder sb = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n");
+            StringBuilder sb = new StringBuilder("");
             sb.append("<workflowTrace>\n");
             sb.append("    <OutboundConnection>\n");
             sb.append("        <alias>alias1</alias>\n");

diff --git a/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/action/ActionTestUtils.java b/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/action/ActionTestUtils.java
@@ -83,7 +83,7 @@ public static <T extends TlsAction> void marshalingEmptyActionYieldsMinimalOutpu
                 logger.warn("The action under test does not follow naming convention. " + xmlName
                         + " does not end with string 'Action'");
             }
-            StringBuilder sb = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n");
+            StringBuilder sb = new StringBuilder("");
             sb.append("<workflowTrace>\n");
             sb.append("    <").append(xmlName).append("/>\n");
             sb.append("</workflowTrace>\n");

diff --git a/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/action/ForwardActionTest.java b/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/action/ForwardActionTest.java
@@ -146,7 +146,7 @@ public void marshalingEmptyActionYieldsMinimalOutput() {
         try {
             action = new ForwardAction(ctx1Alias, ctx2Alias);
             trace.addTlsAction(action);
-            StringBuilder sb = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n");
+            StringBuilder sb = new StringBuilder("");
             sb.append("<workflowTrace>\n");
             sb.append("    <OutboundConnection>\n");
             sb.append("        <alias>ctx1</alias>\n");

diff --git a/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-0.xml b/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-0.xml
@@ -1,15 +1,12 @@
 # Given this config:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <config>
 </config>
 
 # And this input trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
 </workflowTrace>
 
 # We expect this normalized trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>client</alias>
@@ -21,5 +18,4 @@
 </workflowTrace>
 
 # And this after default filter application:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace/>
diff --git a/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-1.xml b/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-1.xml
@@ -1,10 +1,8 @@
 # Given this config:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <config>
 </config>
 
 # And this input trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <Send>
         <messages>
@@ -14,7 +12,6 @@
 </workflowTrace>
 
 # We expect this normalized trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>client</alias>
@@ -33,11 +30,10 @@
 </workflowTrace>
 
 # And this after default filter application:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <Send>
         <messages>
             <ClientHello/>
         </messages>
     </Send>
-</workflowTrace>
+</workflowTrace>
diff --git a/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-2.xml b/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-2.xml
@@ -1,5 +1,4 @@
 # Given this config:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <config>
     <defaulRunningMode>CLIENT</defaulRunningMode>
     <defaultClientConnection>
@@ -19,12 +18,10 @@
 </config>
 
 # And this input trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
 </workflowTrace>
 
 # We expect this normalized trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>client</alias>
@@ -36,5 +33,4 @@
 </workflowTrace>
 
 # And this after default filter application:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace/>
diff --git a/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-3.xml b/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-3.xml
@@ -1,5 +1,4 @@
 # Given this config:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <config>
     <defaultRunningMode>CLIENT</defaultRunningMode>
     <defaultClientConnection>
@@ -19,7 +18,6 @@
 </config>
 
 # And this input trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <Send>
         <messages>
@@ -29,7 +27,6 @@
 </workflowTrace>
 
 # We expect this normalized trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>client</alias>
@@ -48,7 +45,6 @@
 </workflowTrace>
 
 # And this after default filter application:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <Send>
         <messages>

diff --git a/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-4.xml b/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-4.xml
@@ -2,12 +2,10 @@ Test that user default connections that are explicitly overwritten in the
 workflow trace are not overwritten by noramlizing and filtering.
 
 # Given this config:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <config>
 </config>
 
 # And this input trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>client</alias>
@@ -16,7 +14,6 @@ workflow trace are not overwritten by noramlizing and filtering.
 </workflowTrace>
 
 # We expect this normalized trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>client</alias>
@@ -28,7 +25,6 @@ workflow trace are not overwritten by noramlizing and filtering.
 </workflowTrace>
 
 # And this after default filter application:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>client</alias>

diff --git a/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-5.xml b/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-5.xml
@@ -1,12 +1,10 @@
 Test custom connection in workflow trace
 
 # Given this config:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <config>
 </config>
 
 # And this input trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>custom</alias>
@@ -15,7 +13,6 @@ Test custom connection in workflow trace
 </workflowTrace>
 
 # We expect this normalized trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>custom</alias>
@@ -27,7 +24,6 @@ Test custom connection in workflow trace
 </workflowTrace>
 
 # And this after default filter application:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>custom</alias>

diff --git a/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-6.xml b/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-6.xml
@@ -1,10 +1,8 @@
 # Given this config:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <config>
 </config>
 
 # And this input trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <timeout>44</timeout>
@@ -17,7 +15,6 @@
 </workflowTrace>
 
 # We expect this normalized trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>client</alias>
@@ -36,7 +33,6 @@
 </workflowTrace>
 
 # And this after default filter application:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <timeout>44</timeout>
@@ -46,4 +42,4 @@
             <ClientHello/>
         </messages>
     </Send>
-</workflowTrace>
+</workflowTrace>
diff --git a/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-7.xml b/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-7.xml
@@ -3,12 +3,10 @@ if there is only one connection defined in the workflow trace. This is
 true for default and custom connections.
 
 # Given this config:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <config>
 </config>
 
 # And this input trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>custom</alias>
@@ -22,7 +20,6 @@ true for default and custom connections.
 </workflowTrace>
 
 # We expect this normalized trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>custom</alias>
@@ -41,7 +38,6 @@ true for default and custom connections.
 </workflowTrace>
 
 # And this after default filter application:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>custom</alias>
@@ -52,4 +48,4 @@ true for default and custom connections.
             <ClientHello/>
         </messages>
     </Send>
-</workflowTrace>
+</workflowTrace>
diff --git a/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-8.xml b/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-8.xml
@@ -2,12 +2,10 @@ This test illustrates that connection aliases are removed from actions
 if there is only one connection defined in the workflow trace.
 
 # Given this config:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <config>
 </config>
 
 # And this input trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>client</alias>
@@ -20,7 +18,6 @@ if there is only one connection defined in the workflow trace.
 </workflowTrace>
 
 # We expect this normalized trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>client</alias>
@@ -39,7 +36,6 @@ if there is only one connection defined in the workflow trace.
 </workflowTrace>
 
 # And this after default filter application:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <OutboundConnection>
         <alias>client</alias>
@@ -49,4 +45,4 @@ if there is only one connection defined in the workflow trace.
             <ClientHello/>
         </messages>
     </Send>
-</workflowTrace>
+</workflowTrace>
diff --git a/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-9.xml b/...s/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-9.xml
@@ -1,13 +1,11 @@
 Test a MITM workflow trace
 
 # Given this config:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <config>
     <runningMode>MITM</runningMode>
 </config>
 
 # And this input trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <InboundConnection>
         <alias>server</alias>
@@ -84,7 +82,6 @@ Test a MITM workflow trace
 
 
 # We expect this normalized trace
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <InboundConnection>
         <alias>server</alias>
@@ -178,7 +175,6 @@ Test a MITM workflow trace
 
 
 # And this after default filter application:
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workflowTrace>
     <InboundConnection>
         <alias>server</alias>
@@ -251,4 +247,4 @@ Test a MITM workflow trace
         <connectionAlias>server</connectionAlias>
         <stringEncoding>US_ASCII</stringEncoding>
     </PrintLastHandledApplicationData>
-</workflowTrace>
+</workflowTrace>