(#375) Fixed JSON bug in file/pipe mode, Improve JSON Printing

Author: hahwul

cmd/file.go

@@ -147,6 +147,9 @@ var fileCmd = &cobra.Command{
 							}
 						}()
 					}
+					if options.Format == "json" {
+						printing.DalLog("PRINT", "[", options)
+					}
 					for k, v := range t {
 						temp := model.MassJob{
 							Name: k,
@@ -156,6 +159,9 @@ var fileCmd = &cobra.Command{
 					}
 					close(tasks)
 					wg.Wait()
+					if options.Format == "json" {
+						printing.DalLog("PRINT", "{}]", options)
+					}
 					if (!options.NoSpinner || !options.Silence) && !sf {
 						options.SpinnerObject.Stop()
 					}
@@ -172,6 +178,9 @@ var fileCmd = &cobra.Command{
 						}
 						options.SpinnerObject.Start()
 					}
+					if options.Format == "json" {
+						printing.DalLog("PRINT", "[", options)
+					}
 					for i := range targets {
 						options.NowURL = i + 1
 						_, _ = scanning.Scan(targets[i], options, strconv.Itoa(i))
@@ -183,6 +192,9 @@ var fileCmd = &cobra.Command{
 							mutex.Unlock()
 						}
 					}
+					if options.Format == "json" {
+						printing.DalLog("PRINT", "{}]", options)
+					}
 					if (!options.NoSpinner || !options.Silence) && !sf {
 						options.SpinnerObject.Stop()
 					}

cmd/pipe.go

@@ -90,6 +90,9 @@ var pipeCmd = &cobra.Command{
 					}
 				}()
 			}
+			if options.Format == "json" {
+				printing.DalLog("PRINT", "[", options)
+			}
 			for k, v := range t {
 				temp := model.MassJob{
 					Name: k,
@@ -99,6 +102,9 @@ var pipeCmd = &cobra.Command{
 			}
 			close(tasks)
 			wg.Wait()
+			if options.Format == "json" {
+				printing.DalLog("PRINT", "{}]", options)
+			}
 			if (!options.NoSpinner || !options.Silence) && !sf {
 				options.SpinnerObject.Stop()
 			}
@@ -115,6 +121,9 @@ var pipeCmd = &cobra.Command{
 				}
 				options.SpinnerObject.Start()
 			}
+			if options.Format == "json" {
+				printing.DalLog("PRINT", "[", options)
+			}
 			for i := range targets {
 				options.NowURL = i + 1
 				_, _ = scanning.Scan(targets[i], options, strconv.Itoa(i))
@@ -126,6 +135,9 @@ var pipeCmd = &cobra.Command{
 					mutex.Unlock()
 				}
 			}
+			if options.Format == "json" {
+				printing.DalLog("PRINT", "{}]", options)
+			}
 			if (!options.NoSpinner || !options.Silence) && !sf {
 				options.SpinnerObject.Stop()
 			}

cmd/sxss.go

@@ -26,7 +26,13 @@ var sxssCmd = &cobra.Command{
 			}
 			if options.Trigger != "" {
 				printing.DalLog("SYSTEM", "Using Stored XSS mode", options)
+				if options.Format == "json" {
+					printing.DalLog("PRINT", "[", options)
+				}
 				_, _ = scanning.Scan(args[0], options, "Single")
+				if options.Format == "json" {
+					printing.DalLog("PRINT", "{}]", options)
+				}
 			} else {
 				printing.DalLog("ERROR", "Please input trigger url with --trigger option", options)
 			}

cmd/url.go

@@ -15,7 +15,13 @@ var urlCmd = &cobra.Command{
 		printing.Summary(options, args[0])
 		if len(args) >= 1 {
 			printing.DalLog("SYSTEM", "Using single target mode", options)
+			if options.Format == "json" {
+				printing.DalLog("PRINT", "[", options)
+			}
 			_, _ = scanning.Scan(args[0], options, "Single")
+			if options.Format == "json" {
+				printing.DalLog("PRINT", "{}]", options)
+			}
 		} else {
 			printing.DalLog("ERROR", "Input target url", options)
 			printing.DalLog("ERROR", "e.g dalfox url https://google.com/?q=1", options)

pkg/scanning/scan.go

@@ -127,10 +127,6 @@ func Scan(target string, options model.Options, sid string) (model.Result, error
 		printing.DalLog("SYSTEM", "Valid target [ code:"+strconv.Itoa(tres.StatusCode)+" / size:"+strconv.Itoa(len(body))+" ]", options)
 	}
 
-	if options.Format == "json" {
-		printing.DalLog("PRINT", "[", options)
-	}
-
 	var wait sync.WaitGroup
 	task := 3
 	sa := "SA: ✓ "
@@ -1017,9 +1013,7 @@ func Scan(target string, options model.Options, sid string) (model.Result, error
 			s.Stop()
 		}
 	}
-	if options.Format == "json" {
-		printing.DalLog("PRINT", "{}]", options)
-	}
+
 	options.Scan[sid] = scanObject
 	scanResult.EndTime = time.Now()
 	scanResult.Duration = scanResult.EndTime.Sub(scanResult.StartTime)