Made scanner more robust

Author: ic0ns

src/main/java/de/rub/nds/tlsscanner/probe/BleichenbacherProbe.java

@@ -44,7 +44,7 @@ public ProbeResult executeTest() {
         RSAPublicKey publicKey = (RSAPublicKey) CertificateFetcher.fetchServerPublicKey(bleichenbacherConfig.createConfig());
         if (publicKey == null) {
             LOGGER.info("Could not retrieve PublicKey from Server - is the Server running?");
-            return null;
+            return getNotExecutedResult();
         }
         LOGGER.info("Fetched the following server public key: " + publicKey);
         List<Pkcs1Vector> pkcs1Vectors;

src/main/java/de/rub/nds/tlsscanner/probe/PaddingOracleProbe.java

@@ -122,6 +122,9 @@ public ProbeResult executeTest() {
                             lastResult = null;
                             hasError = true;
                         }
+                        if (attacker.isErrornousScans()) {
+                            hasError = true;
+                        }
                         for (VectorResponse vectorResponse : attacker.getVectorResponseList()) {
                             if (vectorResponse.isErrorDuringHandshake()) {
                                 hasError = true;

src/main/java/de/rub/nds/tlsscanner/probe/TlsProbe.java

@@ -69,14 +69,23 @@ public ProbeResult call() {
         long startTime = System.currentTimeMillis();
         ProbeResult result = executeTest();
         long stopTime = System.currentTimeMillis();
-        result.setStarttime(startTime);
-        result.setStoptime(stopTime);
-        LOGGER.info("Finished " + getProbeName() + " -  Took " + (stopTime - startTime) / 1000 + "s");
+        if (result != null) {
+            result.setStarttime(startTime);
+            result.setStoptime(stopTime);
+        } else {
+            LOGGER.warn("" + getProbeName() + " - is null result");
+        }
+
+        LOGGER.info(
+                "Finished " + getProbeName() + " -  Took " + (stopTime - startTime) / 1000 + "s");
         return result;
     }
 
     public final void executeState(State... states) {
-        this.executeState(new ArrayList<State>(Arrays.asList(states)));
+        this.executeState(new ArrayList<State>(Arrays
+                .asList(states
+                )));
+
     }
 
     public final void executeState(List<State> states) {
@@ -87,19 +96,24 @@ public final void executeState(List<State> states) {
 
     }
 
-    public abstract ProbeResult executeTest();
+    public abstract ProbeResult
+            executeTest();
 
-    public abstract boolean shouldBeExecuted(SiteReport report);
+    public abstract boolean shouldBeExecuted(SiteReport report
+    );
 
-    public abstract void adjustConfig(SiteReport report);
+    public abstract void adjustConfig(SiteReport report
+    );
 
     public abstract ProbeResult getNotExecutedResult();
 
     public ParallelExecutor getParallelExecutor() {
         return parallelExecutor;
+
     }
 
     public StatsWriter getWriter() {
         return writer;
+
     }
 }