Merge pull request #30 from RUB-NDS/taskScheduler

Task scheduler

Author: jurajsomorovsky

README.md

@@ -4,7 +4,7 @@ TLS-Scanner is a tool created by the Chair for Network and Data Security from th
 **Please note:**  *TLS-Scanner is a research tool intended for TLS developers, pentesters, administrators and researchers. There is no GUI. It is in the first version and may contain some bugs.*
 
 # Compiling
-In order to compile and use TLS-Scanner, you need to have Java and Maven installed, as well as [TLS-Attacker](https://github.com/RUB-NDS/TLS-Attacker) in Version 3.0
+In order to compile and use TLS-Scanner, you need to have Java and Maven installed, as well as [TLS-Attacker](https://github.com/RUB-NDS/TLS-Attacker) in Version 3.3.0
 
 ```bash
 $ cd TLS-Scanner
@@ -23,7 +23,7 @@ $ mvn clean install
 
 For hints on installing the required libraries checkout the corresponding GitHub repositories.
 
-**Please note:**  *In order to run this tool you need TLS-Attacker version 3.0*
+**Please note:**  *In order to run this tool you need TLS-Attacker version 3.3.0*
 
 # Running
 In order to run TLS-Scanner you need to run the jar file in the apps/ folder.

pom.xml

@@ -3,30 +3,25 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>TLS-Scanner</artifactId>
     <groupId>de.rub.nds.tlsscanner</groupId>
-    <version>2.11</version>
+    <version>3.0.0</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>de.rub.nds.tlsattacker</groupId>
             <artifactId>TLS-Core</artifactId>
-            <version>3.2</version>
+            <version>3.3.0</version>
         </dependency>
         <dependency>
             <groupId>de.rub.nds.tlsattacker</groupId>
             <artifactId>Attacks</artifactId>
-            <version>3.2</version>
+            <version>3.3.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>me.tongfei</groupId>
-            <artifactId>progressbar</artifactId>
-            <version>0.7.4</version>
-        </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
             <artifactId>json-simple</artifactId>
@@ -40,18 +35,13 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.8</version>
+            <version>2.10.0</version>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.9.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
+            <version>2.10.0</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>

src/main/java/de/rub/nds/tlsscanner/ConsoleLogger.java

@@ -17,7 +17,7 @@
  */
 public class ConsoleLogger {
 
-    public static final Logger CONSOLE = LogManager.getLogger("ConsoleLogger");
+    public static final Logger CONSOLE = LogManager.getLogger("Direct");
 
     private ConsoleLogger() {
     }

src/main/java/de/rub/nds/tlsscanner/Main.java

@@ -27,7 +27,7 @@
  */
 public class Main {
 
-    private static final Logger LOGGER = LogManager.getLogger(Main.class.getName());
+    private static final Logger LOGGER = LogManager.getLogger();
 
     public static void main(String[] args) throws IOException {
         ScannerConfig config = new ScannerConfig(new GeneralDelegate());
@@ -40,9 +40,6 @@ public static void main(String[] args) throws IOException {
             }
             // Cmd was parsable
             try {
-                if (config.getGeneralDelegate().isDebug()) {
-                    ThreadContext.put("ROUTINGKEY", "special");
-                }
                 TlsScanner scanner = new TlsScanner(config);
                 long time = System.currentTimeMillis();
                 LOGGER.info("Performing Scan, this may take some time...");

src/main/java/de/rub/nds/tlsscanner/MultiThreadedScanJobExecutor.java

@@ -10,7 +10,6 @@
 
 import de.rub.nds.tlsscanner.probe.TlsProbe;
 import de.rub.nds.tlsscanner.report.after.AfterProbe;
-import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -19,32 +18,19 @@
  */
 public class ScanJob {
 
-    private final List<TlsProbe> phaseTwoTestList;
-    private final List<TlsProbe> phaseOneTestList;
+    private final List<TlsProbe> probeList;
     private final List<AfterProbe> afterList;
 
-    public ScanJob(List<TlsProbe> phaseOneTestList, List<TlsProbe> phaseTwoTestList, List<AfterProbe> afterList) {
-        this.phaseOneTestList = phaseOneTestList;
-        this.phaseTwoTestList = phaseTwoTestList;
+    public ScanJob(List<TlsProbe> probeList, List<AfterProbe> afterList) {
+        this.probeList = probeList;
         this.afterList = afterList;
     }
 
-    public List<TlsProbe> getPhaseOneTestList() {
-        return phaseOneTestList;
-    }
-
-    public List<TlsProbe> getPhaseTwoTestList() {
-        return phaseTwoTestList;
+    public List<TlsProbe> getProbeList() {
+        return probeList;
     }
 
     public List<AfterProbe> getAfterList() {
         return afterList;
     }
-
-    public List<TlsProbe> getJoinedProbes() {
-        List<TlsProbe> probeList = new LinkedList<>();
-        probeList.addAll(phaseOneTestList);
-        probeList.addAll(phaseTwoTestList);
-        return probeList;
-    }
 }

src/main/java/de/rub/nds/tlsscanner/ScanJob.java

@@ -8,7 +8,6 @@
  */
 package de.rub.nds.tlsscanner;
 
-import de.rub.nds.tlsscanner.config.ScannerConfig;
 import de.rub.nds.tlsscanner.report.SiteReport;
 
 /**
@@ -17,7 +16,7 @@
  */
 public abstract class ScanJobExecutor {
 
-    public abstract SiteReport execute(ScannerConfig config, ScanJob scanJob);
+    public abstract SiteReport execute();
 
     public abstract void shutdown();
 }