Updated nbactions.xml

Author: ic0ns

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

@@ -144,30 +144,35 @@ private void fillDefaultProbeLists() {
     }
 
     public SiteReport scan() {
-        if (isConnectable()) {
-            LOGGER.debug(config.getClientDelegate().getHost() + " is connectable");
-            if (speaksTls()) {
+        boolean isConnectable = false;
+        try {
+            if (isConnectable()) {
                 LOGGER.debug(config.getClientDelegate().getHost() + " is connectable");
-                ScanJob job = new ScanJob(phaseOneTestList, phaseTwoTestList, afterList);
-                SiteReport report = executor.execute(config, job);
-                if (closeAfterFinish) {
-                    executor.shutdown();
+                if (speaksTls()) {
+                    LOGGER.debug(config.getClientDelegate().getHost() + " is connectable");
+                    ScanJob job = new ScanJob(phaseOneTestList, phaseTwoTestList, afterList);
+                    SiteReport report = executor.execute(config, job);
+                    return report;
+                } else {
+                    isConnectable = true;
                 }
-                if (closeAfterFinishParallel) {
-                    parallelExecutor.shutdown();
-                }
-                return report;
             }
+            SiteReport report = new SiteReport(config.getClientDelegate().getHost(), new LinkedList<ProbeType>(), config.isNoColor());
+            report.setServerIsAlive(isConnectable);
+            report.setSupportsSslTls(false);
+            return report;
+        } finally {
+            closeExecutorsIfNeeded();
         }
-        SiteReport report = new SiteReport(config.getClientDelegate().getHost(), new LinkedList<ProbeType>(), config.isNoColor());
-        report.setServerIsAlive(false);
+    }
+
+    private void closeExecutorsIfNeeded() {
         if (closeAfterFinish) {
             executor.shutdown();
         }
         if (closeAfterFinishParallel) {
             parallelExecutor.shutdown();
         }
-        return report;
     }
 
     public boolean isConnectable() {

src/main/java/de/rub/nds/tlsscanner/report/SiteReportPrinter.java

@@ -54,7 +54,7 @@ public String getFullReport() {
             return builder.toString();
         }
         if (report.getSupportsSslTls() == Boolean.FALSE) {
-            builder.append("Server does not seem to support SSL / TLS");
+            builder.append("Server does not seem to support SSL / TLS on the scanned port");
             return builder.toString();
         }