Added JSON output

cmd/root.go

@@ -16,6 +16,7 @@ import (
 )
 
 var debug bool
+var jsonOutput bool
 var timeoutMS int = 2000
 var parallelism int = 500
 var portSelection string
@@ -28,6 +29,7 @@ func init() {
 	rootCmd.PersistentFlags().BoolVarP(&versionRequested, "version", "", versionRequested, "Output version information and exit")
 	rootCmd.PersistentFlags().StringVarP(&scanType, "scan-type", "s", scanType, "Scan type. Must be one of stealth, connect")
 	rootCmd.PersistentFlags().BoolVarP(&debug, "verbose", "v", debug, "Enable verbose logging")
+	rootCmd.PersistentFlags().BoolVarP(&jsonOutput, "json", "j", jsonOutput, "Enable JSON output")
 	rootCmd.PersistentFlags().IntVarP(&timeoutMS, "timeout-ms", "t", timeoutMS, "Scan timeout in MS")
 	rootCmd.PersistentFlags().IntVarP(&parallelism, "workers", "w", parallelism, "Parallel routines to scan on")
 	rootCmd.PersistentFlags().StringVarP(&portSelection, "ports", "p", portSelection, "Port to scan. Comma separated, can sue hyphens e.g. 22,80,443,8080-8090")
@@ -90,8 +92,9 @@ var rootCmd = &cobra.Command{
 		}()
 
 		startTime := time.Now()
-		fmt.Printf("\nStarting scan at %s\n\n", startTime.String())
-
+		if !jsonOutput {
+			fmt.Printf("\nStarting scan at %s\n\n", startTime.String())
+		}
 		for _, target := range args {
 
 			targetIterator := scan.NewTargetIterator(target)
@@ -118,15 +121,20 @@ var rootCmd = &cobra.Command{
 			}
 
 			for _, result := range results {
+				if jsonOutput {
+					scanner.OutputResultJSON(result)
+					continue
+				}
 				if !hideUnavailableHosts || result.IsHostUp() {
 					scanner.OutputResult(result)
 				}
 			}
 
 		}
 
-		fmt.Printf("Scan complete in %s.\n", time.Since(startTime).String())
-
+		if !jsonOutput {
+			fmt.Printf("Scan complete in %s.\n", time.Since(startTime).String())
+		}
 	},
 }
 

scan/scan-connect.go

@@ -2,6 +2,7 @@ package scan
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net"
@@ -197,3 +198,8 @@ func (s *ConnectScanner) scanPort(target net.IP, port int) (PortState, error) {
 func (s *ConnectScanner) OutputResult(result Result) {
 	fmt.Println(result.String())
 }
+
+func (s *ConnectScanner) OutputResultJSON(result Result) {
+	resultJSON, _ := json.Marshal(&result)
+	fmt.Println(string(resultJSON))
+}

scan/scan-device.go

@@ -2,6 +2,7 @@ package scan
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net"
@@ -181,3 +182,8 @@ func (s *DeviceScanner) OutputResult(result Result) {
 
 	fmt.Println("")
 }
+
+func (s *DeviceScanner) OutputResultJSON(result Result) {
+	resultJSON, _ := json.Marshal(&result)
+	fmt.Println(string(resultJSON))
+}

scan/scan-syn.go

@@ -2,6 +2,7 @@ package scan
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -411,3 +412,8 @@ func (s *SynScanner) scanHost(job hostJob) (Result, error) {
 func (s *SynScanner) OutputResult(result Result) {
 	fmt.Println(result.String())
 }
+
+func (s *SynScanner) OutputResultJSON(result Result) {
+	resultJSON, _ := json.Marshal(&result)
+	fmt.Println(string(resultJSON))
+}

scan/scanner.go

@@ -7,4 +7,5 @@ type Scanner interface {
 	Start() error
 	Scan(ctx context.Context, ports []int) ([]Result, error)
 	OutputResult(result Result)
+	OutputResultJSON(result Result)
 }