Skip to content

Commit 4417ff3

Browse files
JonSnowWhiteJonSnowWhite
committed
Merge branch 'master' into dependabot/maven/junit-junit-4.13.1
2 parents 4da8a1c + 3efb7da commit 4417ff3

File tree

723 files changed

+14901
-5611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

723 files changed

+14901
-5611
lines changed

‎.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
1+
outputcerts/
12
target/
23
apps/
34
trust_stores_observatory/
45
log/
5-
src/main/resources/trust/*
6+
*/src/main/resources/trust/*
67
pom.xml.tag
78
pom.xml.releaseBackup
89
pom.xml.versionsBackup
910
pom.xml.next
1011
release.properties
1112
dependency-reduced-pom.xml
1213
buildNumber.properties
14+
nbactions.xml
1315
.mvn/timing.properties
1416
.classpath
1517
.project
1618
.settings/
1719
/nbproject/
20+
.factorypath
21+
.idea
22+
*.iml

‎Dockerfile

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
FROM maven:3.6.1-jdk-8
2-
RUN git clone https://github.com/RUB-NDS/TLS-Attacker.git
1+
FROM maven:3.6.1-jdk-8 AS build-image
2+
WORKDIR /build
33
RUN git clone https://github.com/RUB-NDS/TLS-Scanner.git --recurse-submodules
4-
WORKDIR /TLS-Attacker/
4+
5+
WORKDIR /build/TLS-Scanner
56
RUN mvn clean install -DskipTests=true
6-
WORKDIR /TLS-Scanner/
7-
RUN mvn clean install -DskipTests=true
8-
WORKDIR /TLS-Scanner/apps/
9-
ENTRYPOINT ["java" ,"-jar","TLS-Scanner.jar"]
7+
8+
#############
9+
FROM openjdk:8-alpine
10+
11+
COPY --from=build-image /build/TLS-Scanner/apps /apps
12+
13+
WORKDIR /apps
14+
ENTRYPOINT ["java", "-jar", "TLS-Scanner.jar"]
15+

‎README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ TLS-Scanner is a tool created by the Chair for Network and Data Security from th
44
**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.*
55

66
# Compiling
7-
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.1
7+
In order to compile and use TLS-Scanner, you need to run:
88

99
```bash
1010
$ cd TLS-Scanner
@@ -21,10 +21,6 @@ If you want to use TLS-Scanner as a library you need to install it with the foll
2121
$ mvn clean install
2222
```
2323

24-
For hints on installing the required libraries checkout the corresponding GitHub repositories.
25-
26-
**Please note:** *In order to run this tool you need TLS-Attacker version 3.3.1*
27-
2824
# Running
2925
In order to run TLS-Scanner you need to run the jar file in the apps/ folder.
3026

‎TLS-Client-Scanner/pom.xml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>de.rub.nds.tlsscanner</groupId>
6+
<artifactId>TLS-Scanner</artifactId>
7+
<version>4.0.0</version>
8+
</parent>
9+
<name>TLS-Client-Scanner</name>
10+
<packaging>jar</packaging>
11+
<artifactId>TLS-Client-Scanner</artifactId>
12+
<build>
13+
<finalName>TLS-Client-Scanner</finalName>
14+
<plugins>
15+
<plugin>
16+
<!-- Build an executable JAR -->
17+
<groupId>org.apache.maven.plugins</groupId>
18+
<artifactId>maven-jar-plugin</artifactId>
19+
<version>2.6</version>
20+
<configuration>
21+
<archive>
22+
<manifest>
23+
<addClasspath>true</addClasspath>
24+
<classpathPrefix>lib/</classpathPrefix>
25+
<mainClass>de.rub.nds.tlsscanner.clientscanner.Main</mainClass>
26+
</manifest>
27+
</archive>
28+
</configuration>
29+
</plugin>
30+
<plugin>
31+
<groupId>org.apache.maven.plugins</groupId>
32+
<artifactId>maven-dependency-plugin</artifactId>
33+
<version>3.1.2</version>
34+
</plugin>
35+
<plugin>
36+
<groupId>org.apache.maven.plugins</groupId>
37+
<artifactId>maven-failsafe-plugin</artifactId>
38+
<version>3.0.0-M5</version>
39+
</plugin>
40+
<plugin>
41+
<groupId>org.apache.maven.plugins</groupId>
42+
<artifactId>maven-surefire-plugin</artifactId>
43+
<version>3.0.0-M5</version>
44+
</plugin>
45+
</plugins>
46+
</build>
47+
<dependencies>
48+
<dependency>
49+
<groupId>${project.groupId}</groupId>
50+
<artifactId>TLS-Server-Scanner</artifactId>
51+
<version>${project.parent.version}</version>
52+
</dependency>
53+
</dependencies>
54+
<properties>
55+
<maven.compiler.source>1.8</maven.compiler.source>
56+
<maven.compiler.target>1.8</maven.compiler.target>
57+
<main.basedir>${project.parent.basedir}</main.basedir>
58+
</properties>
59+
</project>

‎TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/Main.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/**
2+
* TLS-Scanner - A TLS configuration and analysis tool based on TLS-Attacker.
3+
*
4+
* Copyright 2017-2019 Ruhr University Bochum / Hackmanit GmbH
5+
*
6+
* Licensed under Apache License 2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*/
9+
package de.rub.nds.tlsscanner.clientscanner;
10+
11+
import com.beust.jcommander.JCommander;
12+
import com.beust.jcommander.ParameterException;
13+
import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
14+
import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
15+
16+
import de.rub.nds.tlsscanner.serverscanner.config.ScannerConfig;
17+
18+
public class Main {
19+
20+
public static void main(String[] args) {
21+
22+
}
23+
}

‎TLS-Scanner-Core/pom.xml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>de.rub.nds.tlsscanner</groupId>
6+
<artifactId>TLS-Scanner</artifactId>
7+
<version>4.0.0</version>
8+
</parent>
9+
<packaging>jar</packaging>
10+
<artifactId>TLS-Scanner-Core</artifactId>
11+
<build>
12+
<plugins>
13+
<plugin>
14+
<groupId>org.apache.maven.plugins</groupId>
15+
<artifactId>maven-failsafe-plugin</artifactId>
16+
<version>3.0.0-M5</version>
17+
</plugin>
18+
<plugin>
19+
<groupId>org.apache.maven.plugins</groupId>
20+
<artifactId>maven-surefire-plugin</artifactId>
21+
<version>3.0.0-M5</version>
22+
</plugin>
23+
<plugin>
24+
<artifactId>maven-resources-plugin</artifactId>
25+
<version>3.1.0</version>
26+
<executions>
27+
<execution>
28+
<id>copy-resources</id>
29+
<phase>validate</phase>
30+
<goals>
31+
<goal>copy-resources</goal>
32+
</goals>
33+
<configuration>
34+
<outputDirectory>${project.basedir}/src/main/resources/trust/</outputDirectory>
35+
<resources>
36+
<resource>
37+
<directory>${main.basedir}/trust_stores_observatory/trust_stores/</directory>
38+
</resource>
39+
<resource>
40+
<directory>${main.basedir}/trust_stores_observatory/certificates/</directory>
41+
</resource>
42+
</resources>
43+
</configuration>
44+
</execution>
45+
</executions>
46+
</plugin>
47+
</plugins>
48+
</build>
49+
<properties>
50+
<maven.compiler.source>1.8</maven.compiler.source>
51+
<maven.compiler.target>1.8</maven.compiler.target>
52+
<main.basedir>${project.parent.basedir}</main.basedir>
53+
</properties>
54+
</project>

‎TLS-Server-Scanner/pom.xml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>de.rub.nds.tlsscanner</groupId>
6+
<artifactId>TLS-Scanner</artifactId>
7+
<version>4.0.0</version>
8+
</parent>
9+
<name>TLS-Server-Scanner</name>
10+
<packaging>jar</packaging>
11+
<artifactId>TLS-Server-Scanner</artifactId>
12+
<build>
13+
<finalName>TLS-Server-Scanner</finalName>
14+
<plugins>
15+
<plugin>
16+
<!-- Build an executable JAR -->
17+
<groupId>org.apache.maven.plugins</groupId>
18+
<artifactId>maven-jar-plugin</artifactId>
19+
<version>2.6</version>
20+
<configuration>
21+
<archive>
22+
<manifest>
23+
<addClasspath>true</addClasspath>
24+
<classpathPrefix>lib/</classpathPrefix>
25+
<mainClass>de.rub.nds.tlsscanner.serverscanner.Main</mainClass>
26+
</manifest>
27+
</archive>
28+
</configuration>
29+
</plugin>
30+
<plugin>
31+
<artifactId>maven-clean-plugin</artifactId>
32+
<version>3.0.0</version>
33+
<configuration>
34+
<filesets>
35+
<fileset>
36+
<directory>${main.basedir}/apps</directory>
37+
</fileset>
38+
</filesets>
39+
</configuration>
40+
</plugin>
41+
<plugin>
42+
<groupId>org.apache.maven.plugins</groupId>
43+
<artifactId>maven-dependency-plugin</artifactId>
44+
<version>3.1.2</version>
45+
</plugin>
46+
<plugin>
47+
<groupId>org.apache.maven.plugins</groupId>
48+
<artifactId>maven-failsafe-plugin</artifactId>
49+
<version>3.0.0-M5</version>
50+
</plugin>
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-surefire-plugin</artifactId>
54+
<version>3.0.0-M5</version>
55+
</plugin>
56+
</plugins>
57+
</build>
58+
<dependencies>
59+
<dependency>
60+
<groupId>${project.groupId}</groupId>
61+
<artifactId>TLS-Scanner-Core</artifactId>
62+
<version>${project.parent.version}</version>
63+
</dependency>
64+
</dependencies>
65+
<properties>
66+
<maven.compiler.source>1.8</maven.compiler.source>
67+
<maven.compiler.target>1.8</maven.compiler.target>
68+
<main.basedir>${project.parent.basedir}</main.basedir>
69+
</properties>
70+
</project>

‎src/main/java/de/rub/nds/tlsscanner/ConsoleLogger.java renamed to ‎TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/ConsoleLogger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Licensed under Apache License 2.0
77
* http://www.apache.org/licenses/LICENSE-2.0
88
*/
9-
package de.rub.nds.tlsscanner;
9+
package de.rub.nds.tlsscanner.serverscanner;
1010

1111
import org.apache.logging.log4j.LogManager;
1212
import org.apache.logging.log4j.Logger;

‎src/main/java/de/rub/nds/tlsscanner/Main.java renamed to ‎TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/Main.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,20 @@
66
* Licensed under Apache License 2.0
77
* http://www.apache.org/licenses/LICENSE-2.0
88
*/
9-
package de.rub.nds.tlsscanner;
9+
package de.rub.nds.tlsscanner.serverscanner;
1010

1111
import com.beust.jcommander.JCommander;
1212
import com.beust.jcommander.ParameterException;
13+
1314
import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
1415
import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
15-
import de.rub.nds.tlsscanner.config.ScannerConfig;
16-
import de.rub.nds.tlsscanner.constants.AnsiColor;
17-
import de.rub.nds.tlsscanner.constants.AnsiEscapeSequence;
18-
import de.rub.nds.tlsscanner.report.SiteReport;
16+
import de.rub.nds.tlsscanner.serverscanner.config.ScannerConfig;
17+
import de.rub.nds.tlsscanner.serverscanner.constants.AnsiColor;
18+
import de.rub.nds.tlsscanner.serverscanner.report.SiteReport;
1919
import java.io.IOException;
2020
import org.apache.logging.log4j.LogManager;
2121
import org.apache.logging.log4j.Logger;
22-
import org.apache.logging.log4j.ThreadContext;
2322

24-
/**
25-
*
26-
* @author Robert Merget <[email protected]>
27-
*/
2823
public class Main {
2924

3025
private static final Logger LOGGER = LogManager.getLogger();
@@ -45,12 +40,9 @@ public static void main(String[] args) throws IOException {
4540
LOGGER.info("Performing Scan, this may take some time...");
4641
SiteReport report = scanner.scan();
4742
LOGGER.info("Scanned in: " + ((System.currentTimeMillis() - time) / 1000) + "s\n");
48-
if (!config.getGeneralDelegate().isDebug() && !config.isNoProgressbar()) {
49-
// ANSI escape sequences to erase the progressbar
50-
ConsoleLogger.CONSOLE.info(AnsiEscapeSequence.ANSI_ONE_LINE_UP + AnsiEscapeSequence.ANSI_ERASE_LINE);
51-
}
52-
ConsoleLogger.CONSOLE.info(AnsiColor.RESET.getCode() + "Scanned in: " + ((System.currentTimeMillis() - time) / 1000) + "s\n" + report.getFullReport(config.getReportDetail(), !config.isNoColor()));
53-
43+
ConsoleLogger.CONSOLE.info(AnsiColor.RESET.getCode() + "Scanned in: "
44+
+ ((System.currentTimeMillis() - time) / 1000) + "s\n"
45+
+ report.getFullReport(config.getReportDetail(), !config.isNoColor()));
5446
} catch (ConfigurationException E) {
5547
LOGGER.error("Encountered a ConfigurationException aborting.", E);
5648
}

‎src/main/java/de/rub/nds/tlsscanner/ScanJob.java renamed to ‎TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/ScanJob.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
* Licensed under Apache License 2.0
77
* http://www.apache.org/licenses/LICENSE-2.0
88
*/
9-
package de.rub.nds.tlsscanner;
9+
package de.rub.nds.tlsscanner.serverscanner;
1010

11-
import de.rub.nds.tlsscanner.probe.TlsProbe;
12-
import de.rub.nds.tlsscanner.report.after.AfterProbe;
11+
import de.rub.nds.tlsscanner.serverscanner.probe.TlsProbe;
12+
import de.rub.nds.tlsscanner.serverscanner.report.after.AfterProbe;
1313
import java.util.List;
1414

1515
/**

0 commit comments

Comments
 (0)