Merge pull request #448 from RUB-NDS/new_modvarversion

ic0ns · web-flow · commit 6d4de771d449 · 2018-06-01T12:48:52.000Z
Updated the Version of the ModifiableVariable Package
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/ConfigIO.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/ConfigIO.java
@@ -8,17 +8,38 @@
  */
 package de.rub.nds.tlsattacker.core.config;
 
+import de.rub.nds.modifiablevariable.util.XMLPrettyPrinter;
 import de.rub.nds.tlsattacker.core.config.filter.ConfigDisplayFilter;
 import java.io.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.xml.bind.JAXB;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactoryConfigurationException;
+import org.xml.sax.SAXException;
 
 public class ConfigIO {
+
     public static void write(Config config, File f) {
-        JAXB.marshal(config, f);
+        try {
+            write(config, new FileOutputStream(f));
+        } catch (FileNotFoundException ex) {
+            throw new RuntimeException(ex);
+        }
     }
 
     public static void write(Config config, OutputStream os) {
-        JAXB.marshal(config, os);
+        ByteArrayOutputStream tempStream = new ByteArrayOutputStream();
+
+        JAXB.marshal(config, tempStream);
+        try {
+            os.write(XMLPrettyPrinter.prettyPrintXML(new String(tempStream.toByteArray())).getBytes());
+        } catch (IOException | TransformerException | XPathExpressionException | XPathFactoryConfigurationException
+                | ParserConfigurationException | SAXException ex) {
+            throw new RuntimeException("Could not format XML");
+        }
     }
 
     public static void write(Config config, File f, ConfigDisplayFilter filter) {
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
@@ -11,6 +11,7 @@
 import de.rub.nds.modifiablevariable.ModifiableVariable;
 import de.rub.nds.modifiablevariable.ModificationFilter;
 import de.rub.nds.modifiablevariable.VariableModification;
+import de.rub.nds.modifiablevariable.util.XMLPrettyPrinter;
 import de.rub.nds.tlsattacker.core.protocol.message.ProtocolMessage;
 import de.rub.nds.tlsattacker.core.protocol.message.extension.ExtensionMessage;
 import de.rub.nds.tlsattacker.core.workflow.action.ReceiveAction;
@@ -26,15 +27,22 @@
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
+import javax.xml.parsers.ParserConfigurationException;
 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;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.xml.sax.SAXException;
 
 public class WorkflowTraceSerializer {
 
@@ -107,8 +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/main/resources/default_config.xml b/TLS-Core/src/main/resources/default_config.xml
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/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-0.xml b/TLS-Core/src/test/resources/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/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-1.xml b/TLS-Core/src/test/resources/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/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-2.xml b/TLS-Core/src/test/resources/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/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-3.xml b/TLS-Core/src/test/resources/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/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-4.xml b/TLS-Core/src/test/resources/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/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-5.xml b/TLS-Core/src/test/resources/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/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-6.xml b/TLS-Core/src/test/resources/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/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-7.xml b/TLS-Core/src/test/resources/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/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-8.xml b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-8.xml
diff --git a/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-9.xml b/TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-9.xml
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public static <T extends TlsAction> void marshalingEmptyActionYieldsMinimalOutpu`
`83`	`83`	`logger.warn("The action under test does not follow naming convention. " + xmlName`
`84`	`84`	`+ " does not end with string 'Action'");`
`85`	`85`	`}`
`86`		`- StringBuilder sb = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n");`
	`86`	`+ StringBuilder sb = new StringBuilder("");`
`87`	`87`	`sb.append("<workflowTrace>\n");`
`88`	`88`	`sb.append(" <").append(xmlName).append("/>\n");`
`89`	`89`	`sb.append("</workflowTrace>\n");`