Merge pull request #209 from tls-attacker/configSelector

Added config selector

Author: NErinola

TLS-Client-Scanner/pom.xml

@@ -52,6 +52,12 @@
             <artifactId>TLS-Scanner-Core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>de.rub.nds.tlsscanner</groupId>
+            <artifactId>Scanner-Core</artifactId>
+            <version>4.2.0-SNAPSHOT</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/probe/BasicProbe.java

@@ -29,12 +29,11 @@
 import de.rub.nds.tlsscanner.clientscanner.probe.result.BasicProbeResult;
 import de.rub.nds.tlsscanner.clientscanner.report.ClientReport;
 import de.rub.nds.tlsscanner.core.constants.TlsProbeType;
-import de.rub.nds.tlsscanner.core.probe.TlsProbe;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-public class BasicProbe extends TlsProbe<ClientScannerConfig, ClientReport, BasicProbeResult> {
+public class BasicProbe extends TlsClientProbe<ClientScannerConfig, ClientReport, BasicProbeResult> {
 
     public BasicProbe(ParallelExecutor parallelExecutor, ClientScannerConfig scannerConfig) {
         super(parallelExecutor, TlsProbeType.BASIC, scannerConfig);

TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/probe/ClientRecordFragmentationProbe.java

@@ -24,18 +24,17 @@
 import de.rub.nds.tlsscanner.clientscanner.probe.result.ClientRecordFragmentationResult;
 import de.rub.nds.tlsscanner.clientscanner.report.ClientReport;
 import de.rub.nds.tlsscanner.core.constants.TlsProbeType;
-import de.rub.nds.tlsscanner.core.probe.TlsProbe;
 
 public class ClientRecordFragmentationProbe
-    extends TlsProbe<ClientScannerConfig, ClientReport, ClientRecordFragmentationResult> {
+    extends TlsClientProbe<ClientScannerConfig, ClientReport, ClientRecordFragmentationResult> {
 
     public ClientRecordFragmentationProbe(ClientScannerConfig scannerConfig, ParallelExecutor parallelExecutor) {
         super(parallelExecutor, TlsProbeType.RECORD_FRAGMENTATION, scannerConfig);
     }
 
     @Override
     public ClientRecordFragmentationResult executeTest() {
-        Config config = getScannerConfig().createConfig();
+        Config config = scannerConfig.createConfig();
         config.setDefaultMaxRecordData(50);
 
         WorkflowConfigurationFactory factory = new WorkflowConfigurationFactory(config);

TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/probe/DheParameterProbe.java

@@ -28,15 +28,14 @@
 import de.rub.nds.tlsscanner.clientscanner.report.ClientReport;
 import de.rub.nds.tlsscanner.core.constants.TlsAnalyzedProperty;
 import de.rub.nds.tlsscanner.core.constants.TlsProbeType;
-import de.rub.nds.tlsscanner.core.probe.TlsProbe;
 import java.math.BigInteger;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-public class DheParameterProbe extends TlsProbe<ClientScannerConfig, ClientReport, DheParameterResult> {
+public class DheParameterProbe extends TlsClientProbe<ClientScannerConfig, ClientReport, DheParameterResult> {
 
     private static final Logger LOGGER = LogManager.getLogger();
 

TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/probe/ForcedCompressionProbe.java

@@ -25,17 +25,16 @@
 import de.rub.nds.tlsscanner.clientscanner.probe.result.ForcedCompressionResult;
 import de.rub.nds.tlsscanner.clientscanner.report.ClientReport;
 import de.rub.nds.tlsscanner.core.constants.TlsProbeType;
-import de.rub.nds.tlsscanner.core.probe.TlsProbe;
 
-public class ForcedCompressionProbe extends TlsProbe<ClientScannerConfig, ClientReport, ForcedCompressionResult> {
+public class ForcedCompressionProbe extends TlsClientProbe<ClientScannerConfig, ClientReport, ForcedCompressionResult> {
 
     public ForcedCompressionProbe(ParallelExecutor executor, ClientScannerConfig scannerConfig) {
         super(executor, TlsProbeType.FORCED_COMPRESSION, scannerConfig);
     }
 
     @Override
     public ForcedCompressionResult executeTest() {
-        Config config = getScannerConfig().createConfig();
+        Config config = scannerConfig.createConfig();
         config.setEnforceSettings(true);
         config.setDefaultServerSupportedCompressionMethods(CompressionMethod.DEFLATE, CompressionMethod.LZS);
         config.setDefaultSelectedCompressionMethod(CompressionMethod.DEFLATE);

TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/probe/FreakProbe.java

@@ -37,7 +37,6 @@
 import de.rub.nds.tlsscanner.clientscanner.report.ClientReport;
 import de.rub.nds.tlsscanner.core.constants.TlsAnalyzedProperty;
 import de.rub.nds.tlsscanner.core.constants.TlsProbeType;
-import de.rub.nds.tlsscanner.core.probe.TlsProbe;
 import de.rub.nds.tlsscanner.core.probe.result.VersionSuiteListPair;
 import java.math.BigInteger;
 import java.util.LinkedList;
@@ -47,7 +46,7 @@
 import org.apache.logging.log4j.Logger;
 
 // see https://www.smacktls.com/smack.pdf section V-D
-public class FreakProbe extends TlsProbe<ClientScannerConfig, ClientReport, FreakResult> {
+public class FreakProbe extends TlsClientProbe<ClientScannerConfig, ClientReport, FreakResult> {
 
     private static final Logger LOGGER = LogManager.getLogger();
 

TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/probe/TlsClientProbe.java

@@ -0,0 +1,31 @@
+/**
+ * TLS-Client-Scanner - A TLS configuration and analysis tool based on TLS-Attacker
+ *
+ * Copyright 2017-2022 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
+ *
+ * Licensed under Apache License, Version 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ */
+
+package de.rub.nds.tlsscanner.clientscanner.probe;
+
+import de.rub.nds.scanner.core.probe.result.ProbeResult;
+import de.rub.nds.scanner.core.report.ScanReport;
+import de.rub.nds.tlsattacker.core.workflow.ParallelExecutor;
+import de.rub.nds.tlsscanner.core.constants.TlsProbeType;
+import de.rub.nds.tlsscanner.core.probe.TlsProbe;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public abstract class TlsClientProbe<ClientScannerConfig, Report extends ScanReport, Result extends ProbeResult<Report>>
+    extends TlsProbe<Report, Result> {
+
+    protected static final Logger LOGGER = LogManager.getLogger();
+
+    protected final ClientScannerConfig scannerConfig;
+
+    protected TlsClientProbe(ParallelExecutor parallelExecutor, TlsProbeType type, ClientScannerConfig scannerConfig) {
+        super(parallelExecutor, type);
+        this.scannerConfig = scannerConfig;
+    }
+}

TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/probe/Version13RandomProbe.java

@@ -23,12 +23,11 @@
 import de.rub.nds.tlsscanner.clientscanner.probe.result.Version13RandomResult;
 import de.rub.nds.tlsscanner.clientscanner.report.ClientReport;
 import de.rub.nds.tlsscanner.core.constants.TlsProbeType;
-import de.rub.nds.tlsscanner.core.probe.TlsProbe;
 import java.util.Random;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-public class Version13RandomProbe extends TlsProbe<ClientScannerConfig, ClientReport, Version13RandomResult> {
+public class Version13RandomProbe extends TlsClientProbe<ClientScannerConfig, ClientReport, Version13RandomResult> {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
@@ -54,7 +53,7 @@ public Version13RandomResult executeTest() {
     }
 
     private boolean testIfDownGradeEnforcedProtocolVersion(ProtocolVersion version) {
-        Config config = getScannerConfig().createConfig();
+        Config config = scannerConfig.createConfig();
         config.setHighestProtocolVersion(version);
         config.setDefaultSelectedProtocolVersion(version);
 

TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/probe/VersionProbe.java

@@ -22,14 +22,13 @@
 import de.rub.nds.tlsscanner.clientscanner.probe.result.VersionResult;
 import de.rub.nds.tlsscanner.clientscanner.report.ClientReport;
 import de.rub.nds.tlsscanner.core.constants.TlsProbeType;
-import de.rub.nds.tlsscanner.core.probe.TlsProbe;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-public class VersionProbe extends TlsProbe<ClientScannerConfig, ClientReport, VersionResult> {
+public class VersionProbe extends TlsClientProbe<ClientScannerConfig, ClientReport, VersionResult> {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
@@ -40,7 +39,7 @@ public VersionProbe(ParallelExecutor executor, ClientScannerConfig scannerConfig
     }
 
     protected Config getTls13Config() {
-        Config config = getScannerConfig().createConfig();
+        Config config = scannerConfig.createConfig();
         // no need to set CipherSuites; this is done in executeTest
         config.setAddECPointFormatExtension(false);
         config.setAddEllipticCurveExtension(true);
@@ -63,7 +62,7 @@ public VersionResult executeTest() {
             if (version.isTLS13()) {
                 config = getTls13Config();
             } else {
-                config = getScannerConfig().createConfig();
+                config = scannerConfig.createConfig();
             }
             List<CipherSuite> suitableCiphersuites = clientAdvertisedCipherSuites.stream()
                 .filter(suite -> suite.isSupportedInProtocol(version)).collect(Collectors.toList());

TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/probe/TlsProbe.java

@@ -9,7 +9,6 @@
 
 package de.rub.nds.tlsscanner.core.probe;
 
-import de.rub.nds.scanner.core.config.ScannerConfig;
 import de.rub.nds.scanner.core.probe.ScannerProbe;
 import de.rub.nds.scanner.core.probe.result.ProbeResult;
 import de.rub.nds.scanner.core.report.ScanReport;
@@ -22,25 +21,18 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-public abstract class TlsProbe<ScanConfig extends ScannerConfig, Report extends ScanReport,
-    Result extends ProbeResult<Report>> extends ScannerProbe<Report, Result> {
+public abstract class TlsProbe<Report extends ScanReport, Result extends ProbeResult<Report>>
+    extends ScannerProbe<Report, Result> {
 
     protected static final Logger LOGGER = LogManager.getLogger();
 
-    protected final ScanConfig scannerConfig;
-
     private final ParallelExecutor parallelExecutor;
 
-    protected TlsProbe(ParallelExecutor parallelExecutor, TlsProbeType type, ScanConfig scannerConfig) {
+    protected TlsProbe(ParallelExecutor parallelExecutor, TlsProbeType type) {
         super(type);
-        this.scannerConfig = scannerConfig;
         this.parallelExecutor = parallelExecutor;
     }
 
-    public final ScanConfig getScannerConfig() {
-        return scannerConfig;
-    }
-
     public final void executeState(State... states) {
         this.executeState(new ArrayList<>(Arrays.asList(states)));
 
@@ -60,4 +52,4 @@ public final void executeState(List<State> states) {
     public ParallelExecutor getParallelExecutor() {
         return parallelExecutor;
     }
-}
+}