default Config is now cached to prevent constant deserialisation

Author: ic0ns

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

@@ -86,7 +86,16 @@ public class Config implements Serializable {
      */
     private static final String DEFAULT_CONFIG_FILE = "/default_config.xml";
 
+    private static final ConfigCache DEFAULT_CONFIG_CACHE;
+
+    static {
+        DEFAULT_CONFIG_CACHE = new ConfigCache(createConfig());
+    }
+
     public static Config createConfig() {
+        if (DEFAULT_CONFIG_CACHE != null) {
+            return DEFAULT_CONFIG_CACHE.getCachedCopy();
+        }
         InputStream stream = Config.class.getResourceAsStream(DEFAULT_CONFIG_FILE);
         return ConfigIO.read(stream);
 

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

@@ -0,0 +1,29 @@
+/**
+ * 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;
+
+import org.apache.commons.lang3.SerializationUtils;
+
+/**
+ *
+ * @author robert
+ */
+public class ConfigCache {
+
+    private final Config cachedConfig;
+
+    public ConfigCache(Config cachedConfig) {
+        this.cachedConfig = cachedConfig;
+    }
+
+    public Config getCachedCopy() {
+        return SerializationUtils.clone(cachedConfig);
+    }
+
+}

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/connection/AliasedConnection.java

@@ -12,15 +12,14 @@
 import de.rub.nds.tlsattacker.transport.Connection;
 import de.rub.nds.tlsattacker.transport.ConnectionEndType;
 import de.rub.nds.tlsattacker.transport.TransportHandlerType;
-import java.io.Serializable;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 import javax.xml.bind.annotation.XmlType;
 
 @XmlType(propOrder = { "alias", "port", "hostname", "timeout", "transportHandlerType" })
-public abstract class AliasedConnection extends Connection implements Aliasable, Serializable {
+public abstract class AliasedConnection extends Connection implements Aliasable {
 
     public static final String DEFAULT_CONNECTION_ALIAS = "defaultConnection";
     public static final TransportHandlerType DEFAULT_TRANSPORT_HANDLER_TYPE = TransportHandlerType.TCP;

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/message/extension/KS/KeyShareStoreEntry.java

@@ -10,6 +10,7 @@
 
 import de.rub.nds.modifiablevariable.util.ByteArrayAdapter;
 import de.rub.nds.tlsattacker.core.constants.NamedGroup;
+import java.io.Serializable;
 import java.util.Arrays;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -18,7 +19,7 @@
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
-public class KeyShareStoreEntry {
+public class KeyShareStoreEntry implements Serializable {
 
     private NamedGroup group;
 

Transport/src/main/java/de/rub/nds/tlsattacker/transport/Connection.java

@@ -8,14 +8,15 @@
  */
 package de.rub.nds.tlsattacker.transport;
 
+import java.io.Serializable;
 import java.util.Objects;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlTransient;
 
 @XmlTransient
 @XmlAccessorType(XmlAccessType.FIELD)
-public abstract class Connection {
+public abstract class Connection implements Serializable {
 
     protected Integer port = null;
     protected String hostname = null;