Skip to content

Commit 986303d

Browse files
ConradowatzConradowatz
authored
Merge pull request #728 from tls-attacker/output-improvements
Output Improvements
2 parents 525dcdb + e07102c commit 986303d

File tree

7 files changed

+82
-44
lines changed

7 files changed

+82
-44
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.io.IOException;
2121
import org.apache.logging.log4j.LogManager;
2222
import org.apache.logging.log4j.Logger;
23+
import org.apache.logging.log4j.core.config.Configurator;
2324

2425
public class Main {
2526

@@ -34,6 +35,8 @@ public static void main(String[] args) throws IOException {
3435
commander.usage();
3536
return;
3637
}
38+
System.setProperty("debugMode", String.valueOf(config.getGeneralDelegate().isDebug()));
39+
Configurator.reconfigure();
3740
// Cmd was parsable
3841
try (TlsClientScanner scanner = new TlsClientScanner(config)) {
3942
long time = System.currentTimeMillis();

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,15 @@ public BasicProbe(ParallelExecutor parallelExecutor, ClientScannerConfig scanner
5959

6060
@Override
6161
protected void executeTest() {
62+
LOGGER.info("Waiting for client to connect...");
6263
Config config = scannerConfig.createConfig();
6364
WorkflowTrace trace =
6465
new WorkflowConfigurationFactory(config)
6566
.createTlsEntryWorkflowTrace(config.getDefaultServerConnection());
6667
trace.addTlsAction(new ReceiveAction(new ClientHelloMessage()));
6768
State state = new State(config, trace);
6869
executeState(state);
70+
LOGGER.info("Client connected");
6971
if (state.getWorkflowTrace().executedAsPlanned()) {
7072
TlsContext traceContext = state.getTlsContext();
7173
clientAdvertisedCipherSuites = traceContext.getClientSupportedCipherSuites();

‎TLS-Client-Scanner/src/main/resources/log4j2.xml

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,40 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Configuration status="WARN">
33
<Appenders>
4-
<Console name="Console" target="SYSTEM_OUT">
5-
<ExtendedPatternLayout pattern="%highlight{%-5level: %c{1} - %msg%n%throwable}"/>
6-
</Console>
7-
<Console name="Info" target="SYSTEM_OUT">
8-
<ExtendedPatternLayout pattern="%highlight{%-5level: %c{1}} - %msg%n%highlight{%throwable}"/>
9-
</Console>
10-
<Console name="Direct" target="SYSTEM_OUT">
11-
<ExtendedPatternLayout pattern="%highlight{%msg}%n"/>
12-
</Console>
4+
<Routing name="DynamicConsole">
5+
<Routes pattern="${sys:debugMode:-true}">
6+
<Route key="true">
7+
<Console name="DebugConsole" target="SYSTEM_OUT">
8+
<PatternLayout pattern="%highlight{%-5level: %c{1} - %msg%n%throwable}"/>
9+
</Console>
10+
</Route>
11+
<Route key="false">
12+
<Console name="MinimalConsole" target="SYSTEM_OUT">
13+
<PatternLayout pattern="%highlight{%msg}%n"/>
14+
</Console>
15+
</Route>
16+
</Routes>
17+
</Routing>
18+
1319
</Appenders>
1420
<Loggers>
1521
<Logger name="de.rub.nds.tlsattacker" level="ERROR" additivity="false">
16-
<AppenderRef ref="Console"/>
22+
<AppenderRef ref="DynamicConsole"/>
1723
</Logger>
1824
<Logger name="de.rub.nds.tlsscanner" level="INFO" additivity="false">
19-
<AppenderRef ref="Console"/>
25+
<AppenderRef ref="DynamicConsole"/>
2026
</Logger>
2127
<Logger name="de.rub.nds.scanner" level="INFO" additivity="false">
22-
<AppenderRef ref="Console"/>
28+
<AppenderRef ref="DynamicConsole"/>
2329
</Logger>
2430
<Logger name="DirectLogger" level="OFF" additivity="false">
25-
<AppenderRef ref="Console"/>
31+
<AppenderRef ref="DynamicConsole"/>
32+
</Logger>
33+
<Logger name="org.reflections" level="OFF" additivity="false">
34+
<AppenderRef ref="DynamicConsole"/>
2635
</Logger>
2736
<Root level="INFO">
28-
<AppenderRef ref="Console"/>
37+
<AppenderRef ref="DynamicConsole"/>
2938
</Root>
3039
</Loggers>
3140
</Configuration>

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

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.io.IOException;
2222
import org.apache.logging.log4j.LogManager;
2323
import org.apache.logging.log4j.Logger;
24+
import org.apache.logging.log4j.core.config.Configurator;
2425

2526
public class Main {
2627

@@ -35,22 +36,27 @@ public static void main(String[] args) throws IOException {
3536
commander.usage();
3637
return;
3738
}
39+
System.setProperty("debugMode", String.valueOf(config.getGeneralDelegate().isDebug()));
40+
Configurator.reconfigure();
3841
// Cmd was parsable
3942
try (TlsServerScanner scanner = new TlsServerScanner(config)) {
4043
long time = System.currentTimeMillis();
4144
LOGGER.info("Performing Scan, this may take some time...");
4245
ServerReport report = scanner.scan();
43-
LOGGER.info(
44-
AnsiColor.RESET.getCode()
45-
+ "Scanned in: "
46-
+ ((System.currentTimeMillis() - time) / 1000)
47-
+ "s\n"
48-
+ new ServerReportPrinter(
49-
report,
50-
config.getExecutorConfig().getReportDetail(),
51-
DefaultPrintingScheme.getDefaultPrintingScheme(),
52-
!config.getExecutorConfig().isNoColor())
53-
.getFullReport());
46+
if (report.getIsHandshaking()) {
47+
LOGGER.info(
48+
AnsiColor.RESET.getCode()
49+
+ "Scanned in: "
50+
+ ((System.currentTimeMillis() - time) / 1000)
51+
+ "s\n"
52+
+ new ServerReportPrinter(
53+
report,
54+
config.getExecutorConfig().getReportDetail(),
55+
DefaultPrintingScheme
56+
.getDefaultPrintingScheme(),
57+
!config.getExecutorConfig().isNoColor())
58+
.getFullReport());
59+
}
5460
} catch (ConfigurationException e) {
5561
LOGGER.error("Encountered a ConfigurationException aborting.", e);
5662
}

‎TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/execution/TlsServerScanner.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,19 +286,29 @@ protected boolean checkScanPrerequisites(ServerReport report) {
286286

287287
if (isConnectable()) {
288288
isConnectable = true;
289-
LOGGER.debug(config.getClientDelegate().getHost() + " is connectable");
289+
LOGGER.debug("{} is connectable", config.getClientDelegate().getHost());
290290
configSelector.findWorkingConfigs();
291291
report.setConfigProfileIdentifier(configSelector.getConfigProfileIdentifier());
292292
report.setConfigProfileIdentifierTls13(
293293
configSelector.getConfigProfileIdentifierTls13());
294294
if (configSelector.isSpeaksProtocol()) {
295295
speaksProtocol = true;
296-
LOGGER.debug(config.getClientDelegate().getHost() + " speaks " + getProtocolType());
296+
LOGGER.debug(
297+
"{} speaks {}", config.getClientDelegate().getHost(), getProtocolType());
297298
if (configSelector.isIsHandshaking()) {
298299
isHandshaking = true;
299-
LOGGER.debug(config.getClientDelegate().getHost() + " is handshaking");
300+
LOGGER.debug("{} is handshaking", config.getClientDelegate().getHost());
301+
} else {
302+
LOGGER.error("{} is not handshaking", config.getClientDelegate().getHost());
300303
}
304+
} else {
305+
LOGGER.error(
306+
"{} does not speak {}",
307+
config.getClientDelegate().getHost(),
308+
getProtocolType());
301309
}
310+
} else {
311+
LOGGER.error("{} is not connectable", config.getClientDelegate().getHost());
302312
}
303313

304314
report.setServerIsAlive(isConnectable);

‎TLS-Server-Scanner/src/main/resources/log4j2.xml

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,42 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Configuration status="WARN">
33
<Appenders>
4-
<Console name="Console" target="SYSTEM_OUT">
5-
<ExtendedPatternLayout pattern="%highlight{%-5level: %c{1} - %msg%n%throwable}"/>
6-
</Console>
7-
<Console name="Info" target="SYSTEM_OUT">
8-
<ExtendedPatternLayout pattern="%highlight{%-5level: %c{1}} - %msg%n%highlight{%throwable}"/>
9-
</Console>
10-
<Console name="Direct" target="SYSTEM_OUT">
11-
<ExtendedPatternLayout pattern="%highlight{%msg}%n"/>
12-
</Console>
4+
<Routing name="DynamicConsole">
5+
<Routes pattern="${sys:debugMode:-true}">
6+
<Route key="true">
7+
<Console name="DebugConsole" target="SYSTEM_OUT">
8+
<PatternLayout pattern="%highlight{%-5level: %c{1} - %msg%n%throwable}"/>
9+
</Console>
10+
</Route>
11+
<Route key="false">
12+
<Console name="MinimalConsole" target="SYSTEM_OUT">
13+
<PatternLayout pattern="%highlight{%msg}%n"/>
14+
</Console>
15+
</Route>
16+
</Routes>
17+
</Routing>
1318
</Appenders>
1419
<Loggers>
1520
<Logger name="de.rub.nds.tlsattacker" level="ERROR" additivity="false">
16-
<AppenderRef ref="Console"/>
21+
<AppenderRef ref="DynamicConsole"/>
1722
</Logger>
1823
<Logger name="de.rub.nds.tlsscanner" level="INFO" additivity="false">
19-
<AppenderRef ref="Console"/>
24+
<AppenderRef ref="DynamicConsole"/>
2025
</Logger>
2126
<Logger name="de.rub.nds.scanner" level="INFO" additivity="false">
22-
<AppenderRef ref="Console"/>
27+
<AppenderRef ref="DynamicConsole"/>
2328
</Logger>
2429
<Logger name="org.xbill.dns" level="WARN" additivity="false">
25-
<AppenderRef ref="Console"/>
30+
<AppenderRef ref="DynamicConsole"/>
2631
</Logger>
2732
<Logger name="DirectLogger" level="OFF" additivity="false">
28-
<AppenderRef ref="Console"/>
33+
<AppenderRef ref="DynamicConsole"/>
34+
</Logger>
35+
<Logger name="org.reflections" level="OFF" additivity="false">
36+
<AppenderRef ref="DynamicConsole"/>
2937
</Logger>
3038
<Root level="INFO">
31-
<AppenderRef ref="Console"/>
39+
<AppenderRef ref="DynamicConsole"/>
3240
</Root>
3341
</Loggers>
3442
</Configuration>

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
<dependency>
141141
<groupId>de.rub.nds</groupId>
142142
<artifactId>scanner-core</artifactId>
143-
<version>6.2.0</version>
143+
<version>6.2.1</version>
144144
</dependency>
145145
<dependency>
146146
<groupId>de.rub.nds</groupId>

0 commit comments

Comments
 (0)