display infos about connection establishment

Author: Conradowatz

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

@@ -59,13 +59,15 @@ public BasicProbe(ParallelExecutor parallelExecutor, ClientScannerConfig scanner
 
     @Override
     protected void executeTest() {
+        LOGGER.info("Waiting for client to connect...");
         Config config = scannerConfig.createConfig();
         WorkflowTrace trace =
                 new WorkflowConfigurationFactory(config)
                         .createTlsEntryWorkflowTrace(config.getDefaultServerConnection());
         trace.addTlsAction(new ReceiveAction(new ClientHelloMessage()));
         State state = new State(config, trace);
         executeState(state);
+        LOGGER.info("Client connected");
         if (state.getWorkflowTrace().executedAsPlanned()) {
             TlsContext traceContext = state.getTlsContext();
             clientAdvertisedCipherSuites = traceContext.getClientSupportedCipherSuites();

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

@@ -43,17 +43,20 @@ public static void main(String[] args) throws IOException {
                 long time = System.currentTimeMillis();
                 LOGGER.info("Performing Scan, this may take some time...");
                 ServerReport report = scanner.scan();
-                LOGGER.info(
-                        AnsiColor.RESET.getCode()
-                                + "Scanned in: "
-                                + ((System.currentTimeMillis() - time) / 1000)
-                                + "s\n"
-                                + new ServerReportPrinter(
-                                                report,
-                                                config.getExecutorConfig().getReportDetail(),
-                                                DefaultPrintingScheme.getDefaultPrintingScheme(),
-                                                !config.getExecutorConfig().isNoColor())
-                                        .getFullReport());
+                if (report.getIsHandshaking()) {
+                    LOGGER.info(
+                            AnsiColor.RESET.getCode()
+                                    + "Scanned in: "
+                                    + ((System.currentTimeMillis() - time) / 1000)
+                                    + "s\n"
+                                    + new ServerReportPrinter(
+                                                    report,
+                                                    config.getExecutorConfig().getReportDetail(),
+                                                    DefaultPrintingScheme
+                                                            .getDefaultPrintingScheme(),
+                                                    !config.getExecutorConfig().isNoColor())
+                                            .getFullReport());
+                }
             } catch (ConfigurationException e) {
                 LOGGER.error("Encountered a ConfigurationException aborting.", e);
             }

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

@@ -286,19 +286,29 @@ protected boolean checkScanPrerequisites(ServerReport report) {
 
         if (isConnectable()) {
             isConnectable = true;
-            LOGGER.debug(config.getClientDelegate().getHost() + " is connectable");
+            LOGGER.debug("{} is connectable", config.getClientDelegate().getHost());
             configSelector.findWorkingConfigs();
             report.setConfigProfileIdentifier(configSelector.getConfigProfileIdentifier());
             report.setConfigProfileIdentifierTls13(
                     configSelector.getConfigProfileIdentifierTls13());
             if (configSelector.isSpeaksProtocol()) {
                 speaksProtocol = true;
-                LOGGER.debug(config.getClientDelegate().getHost() + " speaks " + getProtocolType());
+                LOGGER.debug(
+                        "{} speaks {}", config.getClientDelegate().getHost(), getProtocolType());
                 if (configSelector.isIsHandshaking()) {
                     isHandshaking = true;
-                    LOGGER.debug(config.getClientDelegate().getHost() + " is handshaking");
+                    LOGGER.debug("{} is handshaking", config.getClientDelegate().getHost());
+                } else {
+                    LOGGER.error("{} is not handshaking", config.getClientDelegate().getHost());
                 }
+            } else {
+                LOGGER.error(
+                        "{} does not speak {}",
+                        config.getClientDelegate().getHost(),
+                        getProtocolType());
             }
+        } else {
+            LOGGER.error("{} is not connectable", config.getClientDelegate().getHost());
         }
 
         report.setServerIsAlive(isConnectable);