Merge pull request #394 from RUB-NDS/configDisplayFilter

DisplayFilter for Config Objects

Author: ic0ns

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/Config.java

@@ -88,28 +88,6 @@ public static Config createConfig(InputStream stream) {
         return ConfigIO.read(stream);
     }
 
-    public static Config createEmptyConfig() {
-        Config c = new Config();
-        for (Field field : c.getClass().getDeclaredFields()) {
-            if (!field.getName().equals("LOGGER") && !field.getType().isPrimitive()) {
-                field.setAccessible(true);
-                try {
-                    field.set(c, null);
-                } catch (IllegalAccessException e) {
-                    LOGGER.warn("Could not set field in Config!", e);
-                }
-            }
-        }
-        return c;
-    }
-
-    public static Config mergeWithDefaultValues(Config c) {
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        ConfigIO.write(c, byteArrayOutputStream);
-        c = ConfigIO.read(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()));
-        return c;
-    }
-
     /**
      * List of filters to apply on workflow traces before serialization.
      */
@@ -954,7 +932,7 @@ public static Config mergeWithDefaultValues(Config c) {
      * Extension defined in RFC5077, followed by additional TLS 1.3 draft 21
      * NewSessionTicket parameters.
      */
-    private long sessionTicketLifetimeHint = 0;
+    private Long sessionTicketLifetimeHint = 0l;
 
     @XmlJavaTypeAdapter(ByteArrayAdapter.class)
     private byte[] sessionTicketKeyAES = ArrayConverter.hexStringToByteArray("536563757265535469636b65744b6579"); // SecureSTicketKey

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/ConfigIO.java

@@ -8,9 +8,9 @@
  */
 package de.rub.nds.tlsattacker.core.config;
 
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
+import de.rub.nds.tlsattacker.core.config.filter.ConfigDisplayFilter;
+
+import java.io.*;
 import javax.xml.bind.JAXB;
 
 public class ConfigIO {
@@ -22,6 +22,18 @@ public static void write(Config config, OutputStream os) {
         JAXB.marshal(config, os);
     }
 
+    public static void write(Config config, File f, ConfigDisplayFilter filter) {
+        Config filteredConfig = copy(config);
+        filter.applyFilter(filteredConfig);
+        write(filteredConfig, f);
+    }
+
+    public static void write(Config config, OutputStream os, ConfigDisplayFilter filter) {
+        Config filteredConfig = copy(config);
+        filter.applyFilter(filteredConfig);
+        write(filteredConfig, os);
+    }
+
     public static Config read(File f) {
         Config config = JAXB.unmarshal(f, Config.class);
         return config;
@@ -32,6 +44,12 @@ public static Config read(InputStream stream) {
         return config;
     }
 
+    public static Config copy(Config config) {
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        ConfigIO.write(config, byteArrayOutputStream);
+        return ConfigIO.read(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()));
+    }
+
     private ConfigIO() {
     }
 }

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/filter/ConfigDisplayFilter.java

@@ -0,0 +1,15 @@
+/**
+ * TLS-Attacker - A Modular Penetration Testing Framework for TLS
+ *
+ * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ *
+ * Licensed under Apache License 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package de.rub.nds.tlsattacker.core.config.filter;
+
+import de.rub.nds.tlsattacker.core.config.Config;
+
+public interface ConfigDisplayFilter {
+    void applyFilter(Config config);
+}

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/filter/RemoveDefaultValues.java

@@ -0,0 +1,59 @@
+/**
+ * TLS-Attacker - A Modular Penetration Testing Framework for TLS
+ *
+ * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ *
+ * Licensed under Apache License 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package de.rub.nds.tlsattacker.core.config.filter;
+
+import de.rub.nds.tlsattacker.core.config.Config;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+public class RemoveDefaultValues implements ConfigDisplayFilter {
+
+    static final Logger LOGGER = LogManager.getLogger(RemoveDefaultValues.class);
+
+    @Override
+    public void applyFilter(Config config) {
+        Config defaultConfig = Config.createConfig();
+        for (Field field : Config.class.getDeclaredFields()) {
+            if (!(Modifier.isStatic(field.getModifiers()) || Modifier.isFinal(field.getModifiers()))) {
+                if (field.getType().isArray() || !field.getType().isPrimitive()) {
+                    field.setAccessible(true);
+                    try {
+                        Object defaultValue = field.get(defaultConfig);
+                        Object configValue = field.get(config);
+                        if (configValue != null)
+                            if (field.getType().isArray()) {
+                                if (Array.getLength(defaultValue) == Array.getLength(configValue)) {
+                                    boolean equal = true;
+                                    for (int i = 0; i < Array.getLength(defaultValue); i++) {
+                                        if (!Array.get(defaultValue, i).equals(Array.get(configValue, i))) {
+                                            equal = false;
+                                            break;
+                                        }
+                                    }
+                                    if (equal)
+                                        field.set(config, null);
+                                }
+                            } else {
+                                if (defaultValue.equals(configValue))
+                                    field.set(config, null);
+                            }
+                    } catch (IllegalAccessException e) {
+                        LOGGER.warn("Could not remove field in Config!", e);
+                    }
+                    field.setAccessible(false);
+                }
+            }
+        }
+    }
+
+}