Added no progressbar flag

Author: ic0ns

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

@@ -23,8 +23,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import me.tongfei.progressbar.ProgressBar;
-import me.tongfei.progressbar.ProgressBarBuilder;
-import me.tongfei.progressbar.ProgressBarStyle;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -47,8 +45,8 @@ public MultiThreadedScanJobExecutor(ExecutorService executor) {
     }
 
     public SiteReport execute(ScannerConfig config, ScanJob scanJob) {
-        
-        if(config.getGeneralDelegate().isDebug()){
+
+        if (config.getGeneralDelegate().isDebug() || config.isNoProgressbar()) {
             return scan(config, scanJob, null);
         } else {
             int numberOfProbes = 0;
@@ -67,10 +65,10 @@ public SiteReport execute(ScannerConfig config, ScanJob scanJob) {
             }
         }
     }
-    
+
     private SiteReport scan(ScannerConfig config, ScanJob scanJob, ProgressBar pb) {
         List<ProbeType> probeTypes = new LinkedList<>();
-        if(pb != null){
+        if (pb != null) {
             pb.setExtraMessage("Executing Probes");
         }
         List<Future<ProbeResult>> futureResults = new LinkedList<>();
@@ -118,7 +116,7 @@ private SiteReport scan(ScannerConfig config, ScanJob scanJob, ProgressBar pb) {
                     ProbeResult result = probe.getNotExecutedResult();
                     if (result != null) {
                         resultList.add(result);
-                        if(pb != null){
+                        if (pb != null) {
                             pb.step();
                         }
                     }
@@ -149,8 +147,8 @@ private SiteReport scan(ScannerConfig config, ScanJob scanJob, ProgressBar pb) {
         LOGGER.info("Finished scan for: " + hostname);
         return report;
     }
-    
-    private void checkProbesDone(List<Future<ProbeResult>> futureResults, ProgressBar pb){
+
+    private void checkProbesDone(List<Future<ProbeResult>> futureResults, ProgressBar pb) {
         boolean isNotReady = true;
         int done = 0;
         int tempDone = 0;
@@ -161,7 +159,7 @@ private void checkProbesDone(List<Future<ProbeResult>> futureResults, ProgressBa
                     tempDone++;
                 }
                 if (done < tempDone) {
-                    if(pb != null){
+                    if (pb != null) {
                         pb.step();
                     }
                     done = tempDone;
@@ -171,7 +169,7 @@ private void checkProbesDone(List<Future<ProbeResult>> futureResults, ProgressBa
                 }
             }
         }
-    }   
+    }
 
     @Override
     public void shutdown() {

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

@@ -43,7 +43,7 @@ private String getPaddedProbeName( String probeName){
     @Override
     public SiteReport execute(ScannerConfig config, ScanJob scanJob) {
 
-        if(config.getGeneralDelegate().isDebug()){
+        if(config.getGeneralDelegate().isDebug() || config.isNoProgressbar()){
             return scan(config, scanJob, null);
         } else {
             int numberOfProbes = 0;

src/main/java/de/rub/nds/tlsscanner/config/ScannerConfig.java

@@ -52,6 +52,8 @@ public class ScannerConfig extends TLSDelegateConfig {
     @Parameter(names = "-aggressiv", required = false, description = "The level of concurrent handshakes (only applies to some resource intensive tests)")
     private int aggroLevel = 1;
 
+    private boolean noProgressbar = false;
+
     @ParametersDelegate
     private StarttlsDelegate starttlsDelegate;
 
@@ -65,6 +67,14 @@ public ScannerConfig(GeneralDelegate delegate) {
         addDelegate(starttlsDelegate);
     }
 
+    public boolean isNoProgressbar() {
+        return noProgressbar;
+    }
+
+    public void setNoProgressbar(boolean noProgressbar) {
+        this.noProgressbar = noProgressbar;
+    }
+
     public int getAggroLevel() {
         return aggroLevel;
     }