Merge pull request #52 from tls-attacker/fuzzer

Introduces IllegalStringAdapter

Author: ic0ns

pom.xml

@@ -89,6 +89,12 @@
             <artifactId>jaxb-runtime</artifactId>
             <version>2.3.3</version>
         </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/java/de/rub/nds/modifiablevariable/string/ModifiableString.java

@@ -11,10 +11,13 @@
 
 import de.rub.nds.modifiablevariable.ModifiableVariable;
 import de.rub.nds.modifiablevariable.VariableModification;
+import de.rub.nds.modifiablevariable.util.IllegalStringAdapter;
 import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  *
@@ -23,6 +26,7 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ModifiableString extends ModifiableVariable<String> implements Serializable {
 
+    @XmlJavaTypeAdapter(IllegalStringAdapter.class)
     private String originalValue;
 
     public ModifiableString() {
@@ -48,7 +52,7 @@ public boolean isOriginalValueModified() {
     }
 
     public byte[] getByteArray(int size) {
-        return getValue().getBytes();
+        return getValue().getBytes(StandardCharsets.ISO_8859_1);
     }
 
     @Override

src/main/java/de/rub/nds/modifiablevariable/util/IllegalStringAdapter.java

@@ -0,0 +1,29 @@
+/**
+ * ModifiableVariable - A Variable Concept for Runtime Modifications
+ *
+ * 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.modifiablevariable.util;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+import org.apache.commons.lang.StringEscapeUtils;
+
+/**
+ *
+ */
+public class IllegalStringAdapter extends XmlAdapter<String, String> {
+
+    @Override
+    public String unmarshal(String value) {
+        return StringEscapeUtils.unescapeJava(value);
+    }
+
+    @Override
+    public String marshal(String value) {
+        return StringEscapeUtils.escapeJava(value);
+    }
+}

src/test/java/de/rub/nds/modifiablevariable/util/IllegalStringAdapterTest.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2021 ic0ns.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.rub.nds.modifiablevariable.util;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class IllegalStringAdapterTest {
+
+    private Logger LOGGER = LogManager.getLogger();
+
+    public IllegalStringAdapterTest() {
+    }
+
+    @BeforeClass
+    public static void setUpClass() {
+    }
+
+    @AfterClass
+    public static void tearDownClass() {
+    }
+
+    @Before
+    public void setUp() {
+    }
+
+    @After
+    public void tearDown() {
+    }
+
+    /**
+     * Test of unmarshal method, of class IllegalStringAdapter.
+     */
+    @Test
+    public void testUnmarshal() {
+        IllegalStringAdapter instance = new IllegalStringAdapter();
+        byte[] data = new byte[256];
+        for (int i = 0; i < data.length; i++) {
+            data[i] = (byte) i;
+        }
+        LOGGER.info("Bytes :"
+            + Arrays.toString(new String(data, StandardCharsets.ISO_8859_1).getBytes(StandardCharsets.ISO_8859_1)));
+        String marshal = instance.marshal(new String(data, StandardCharsets.ISO_8859_1));
+        LOGGER.info("Marshal: " + marshal);
+        String unmarshal = instance.unmarshal(marshal);
+        LOGGER.info("Unescaped:" + StringEscapeUtils.unescapeXml(unmarshal));
+        LOGGER.info("Unmarshal: " + unmarshal);
+        assertArrayEquals(data, unmarshal.getBytes(StandardCharsets.ISO_8859_1));
+    }
+}