Merge branch 'main' into json_updatze

Author: ic0ns

pom.xml

@@ -8,7 +8,7 @@
     </parent>
 
     <artifactId>scanner-core</artifactId>
-    <version>6.1.3-json</version>
+    <version>6.1.3-SNAPSHOT</version>
 
     <name>Scanner Core</name>
     <description>A generic scanner framework which can execute a set of probes and combine the results into a report.</description>
@@ -60,7 +60,7 @@
     <scm>
         <connection>scm:git:https://github.com/tls-attacker/scanner-core.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/tls-attacker/scanner-core.git</developerConnection>
-        <tag>v5.5.0</tag>
+        <tag>v6.1.2</tag>
         <url>https://github.com/tls-attacker/Scanner-Core</url>
     </scm>
 
@@ -93,6 +93,11 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-joda</artifactId>
         </dependency>
+        <dependency>
+            <groupId>de.rub.nds</groupId>
+            <artifactId>protocol-attacker</artifactId>
+            <version>2.1.0</version>
+        </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>

src/main/java/de/rub/nds/scanner/core/execution/ThreadedScanJobExecutor.java

@@ -8,12 +8,6 @@
  */
 package de.rub.nds.scanner.core.execution;
 
-import de.rub.nds.scanner.core.afterprobe.AfterProbe;
-import de.rub.nds.scanner.core.config.ExecutorConfig;
-import de.rub.nds.scanner.core.passive.ExtractedValueContainer;
-import de.rub.nds.scanner.core.passive.TrackableValue;
-import de.rub.nds.scanner.core.probe.ScannerProbe;
-import de.rub.nds.scanner.core.report.ScanReport;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
@@ -24,8 +18,14 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.ThreadPoolExecutor;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import java.util.logging.LogManager;
+
+import de.rub.nds.scanner.core.afterprobe.AfterProbe;
+import de.rub.nds.scanner.core.config.ExecutorConfig;
+import de.rub.nds.scanner.core.passive.ExtractedValueContainer;
+import de.rub.nds.scanner.core.passive.TrackableValue;
+import de.rub.nds.scanner.core.probe.ScannerProbe;
+import de.rub.nds.scanner.core.report.ScanReport;
 
 public class ThreadedScanJobExecutor<
                 ReportT extends ScanReport,

src/main/java/de/rub/nds/scanner/core/probe/ScannerProbe.java

@@ -110,32 +110,17 @@ public final <T> void putIfEqual(
     }
 
     private TestResult convertToResult(AnalyzedProperty property, Object result) {
-        // TODO: Use pattern matching with java 17(+)
-        if (result instanceof TestResult) {
-            return (TestResult) result;
-        }
-        if (result instanceof String) {
-            return new StringResult(property, (String) result);
-        }
-        if (result instanceof Long) {
-            return new LongResult(property, (Long) result);
-        }
-        if (result instanceof Integer) {
-            return new IntegerResult(property, (Integer) result);
-        }
-        if (result instanceof BigInteger) {
-            return new BigIntegerResult(property, (BigInteger) result);
-        }
-        if (result instanceof Set) {
-            return new SetResult<>(property, (Set<?>) result);
-        }
-        if (result instanceof Map) {
-            return new MapResult<>(property, (Map<?, ?>) result);
-        }
-        if (result instanceof List) {
-            return new ListResult<>(property, (List<?>) result);
-        }
-        return new ObjectResult<>(property, result);
+        return switch (result) {
+            case TestResult testResult -> testResult;
+            case String stringValue -> new StringResult(property, stringValue);
+            case Long longValue -> new LongResult(property, longValue);
+            case Integer intValue -> new IntegerResult(property, intValue);
+            case BigInteger bigIntValue -> new BigIntegerResult(property, bigIntValue);
+            case Set<?> setValue -> new SetResult<>(property, setValue);
+            case Map<?, ?> mapValue -> new MapResult<>(property, mapValue);
+            case List<?> listValue -> new ListResult<>(property, listValue);
+            default -> new ObjectResult<>(property, result);
+        };
     }
 
     public final <T> void put(AnalyzedProperty property, T result) {

src/main/java/de/rub/nds/scanner/core/report/container/KeyValueContainer.java

@@ -47,9 +47,8 @@ private String pad(String text, int size) {
             return text + " ".repeat(size - text.length());
         } else if (text.length() > size) {
             LOGGER.warn(
-                    "KeyValue 'Key' size is bigger than PADDED_KEY_LENGTH:"
-                            + PADDED_KEY_LENGTH
-                            + " - which breaks the layout. Consider choosing a shorter name or raising PADDED_KEY_LEGNTH");
+                    "KeyValue 'Key' size is bigger than PADDED_KEY_LENGTH:{} - which breaks the layout. Consider choosing a shorter name or raising PADDED_KEY_LEGNTH",
+                    PADDED_KEY_LENGTH);
             return text;
         } else {
             return text;

src/main/java/de/rub/nds/scanner/core/util/JaxbSerializer.java

@@ -8,6 +8,7 @@
  */
 package de.rub.nds.scanner.core.util;
 
+import de.rub.nds.protocol.util.SilentByteArrayOutputStream;
 import jakarta.xml.bind.*;
 import jakarta.xml.bind.util.JAXBSource;
 import java.io.*;
@@ -59,7 +60,7 @@ public void write(File file, T obj) throws IOException, JAXBException {
     public void write(OutputStream outputStream, T obj) throws JAXBException, IOException {
         Marshaller m = context.createMarshaller();
         m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-        try (ByteArrayOutputStream tempStream = new ByteArrayOutputStream()) {
+        try (SilentByteArrayOutputStream tempStream = new SilentByteArrayOutputStream()) {
             Transformer transformer = TransformerFactory.newInstance().newTransformer();
             transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
             transformer.setOutputProperty(OutputKeys.INDENT, "yes");