feat: ips from list

Author: fagci

README.md

@@ -66,6 +66,16 @@ Scan subnet for RTSP servers:
 ./gons -net 192.168.0.1/24 -s rtsp
 ```
 
+Scan list of networks and hosts:
+
+```sh
+./gons -list city_cidrs.txt -s rtsp
+```
+
+```sh
+cat city_cidrs.txt | ./gons -s rtsp -list -
+```
+
 ## Testing
 
 ```sh

go.mod

@@ -2,4 +2,4 @@ module github.com/fagci/gons
 
 go 1.17
 
-require github.com/fagci/gonr v0.1.6
+require github.com/fagci/gonr v0.1.7

go.sum

@@ -1,2 +1,2 @@
-github.com/fagci/gonr v0.1.6 h1:sqAztCeZzEkYXW480gdbK9WjIhV/m4dJkyLYk5sODm0=
-github.com/fagci/gonr v0.1.6/go.mod h1:k+bJomcfPjuSt1F7nJgrj6J5L+medRdCoEfQtGEIeTI=
+github.com/fagci/gonr v0.1.7 h1:h+o8kPK1Wi422HF7YC8IS2L2MFxRNt4ac3006eBVPjY=
+github.com/fagci/gonr v0.1.7/go.mod h1:k+bJomcfPjuSt1F7nJgrj6J5L+medRdCoEfQtGEIeTI=

main.go

@@ -20,6 +20,7 @@ var (
 	iface          string
 	randomIPsCount int64
 	cidrNetwork    string
+	ipList         string
 	scanWorkers    int
 	connTimeout    time.Duration
 	scanPorts      string
@@ -38,6 +39,7 @@ func init() {
 	flag.StringVar(&iface, "i", "", "use specific network interface")
 	flag.Int64Var(&randomIPsCount, "n", -1, "generate N random WAN IPs")
 	flag.StringVar(&cidrNetwork, "net", "", "Network in CIDR notation to scan in random order")
+	flag.StringVar(&ipList, "list", "", "IP/networks list (CIDR) to scan in random order")
 	flag.IntVar(&scanWorkers, "w", 64, "workers count")
 	flag.IntVar(&scanWorkers, "workers", 64, "workers count")
 	flag.DurationVar(&connTimeout, "t", 700*time.Millisecond, "scan connect timeout")
@@ -58,37 +60,7 @@ func init() {
 	flag.BoolVar(&callbackE, "cbde", false, "disable callback errors")
 }
 
-func main() {
-	flag.Parse()
-
-	if iface != "" {
-		if err := network.SetInterface(iface); err != nil {
-			utils.EPrintln("[E] iface", err)
-			return
-		}
-		utils.EPrintln("[i] Iface", iface)
-	}
-
-	var ipSource <-chan net.IP
-	if cidrNetwork == "" {
-		ipGenerator := generators.NewIPGenerator(4, randomIPsCount)
-		ipSource = ipGenerator.Generate()
-	} else {
-		ipSource = generators.RandomHostsFromCIDRGen(cidrNetwork)
-	}
-	processor := services.NewProcessor(ipSource, scanWorkers)
-
-	var cbFlags utils.Flags
-	if !callbackE {
-		cbFlags = cbFlags.Set(utils.ERR)
-	}
-	if !callbackW {
-		cbFlags = cbFlags.Set(utils.WARN)
-	}
-	if !callbackI {
-		cbFlags = cbFlags.Set(utils.INFO)
-	}
-
+func setupSercices(processor *services.Processor) {
 	if service == "" {
 		processor.AddService(services.NewDummyService())
 	} else {
@@ -122,6 +94,19 @@ func main() {
 			processor.AddService(svc)
 		}
 	}
+}
+
+func process(processor *services.Processor) {
+	var cbFlags utils.Flags
+	if !callbackE {
+		cbFlags = cbFlags.Set(utils.ERR)
+	}
+	if !callbackW {
+		cbFlags = cbFlags.Set(utils.WARN)
+	}
+	if !callbackI {
+		cbFlags = cbFlags.Set(utils.INFO)
+	}
 
 	sp := utils.Spinner{}
 	sp.Start()
@@ -154,3 +139,35 @@ func main() {
 		}
 	}
 }
+
+func main() {
+	flag.Parse()
+
+	if iface != "" {
+		if err := network.SetInterface(iface); err != nil {
+			utils.EPrintln("[E] iface", err)
+			return
+		}
+		utils.EPrintln("[i] Iface", iface)
+	}
+
+	var ipSource <-chan net.IP
+	if ipList != "" {
+        list, err := utils.LoadInput(ipList)
+        if err != nil {
+			utils.EPrintln("[E] IP list", err)
+			return
+        }
+        ipSource = generators.RandomHostsFromListGen(list)
+	} else if cidrNetwork == "" {
+		ipGenerator := generators.NewIPGenerator(4, randomIPsCount)
+		ipSource = ipGenerator.Generate()
+	} else {
+		ipSource = generators.RandomHostsFromCIDRGen(cidrNetwork)
+	}
+
+	processor := services.NewProcessor(ipSource, scanWorkers)
+
+	setupSercices(processor)
+	process(processor)
+}

utils/input.go

@@ -0,0 +1,37 @@
+package utils
+
+import (
+	"bufio"
+	"errors"
+	"os"
+	"strings"
+
+	"github.com/fagci/gons/loaders"
+)
+
+func fileExists(path string) bool {
+	_, err := os.Stat(path)
+	return !errors.Is(err, os.ErrNotExist)
+}
+
+func LoadInput(input string) ([]string, error) {
+	var lines []string
+	var err error
+
+	switch {
+	case input == "-":
+		reader := bufio.NewScanner(os.Stdin)
+		for reader.Scan() {
+			lines = append(lines, reader.Text())
+		}
+		err = reader.Err()
+	case fileExists(input):
+		lines, err = loaders.FileToArray(input)
+	default:
+		lines = strings.FieldsFunc(input, func(c rune) bool {
+			return c == '\n' || c == '\r'
+		})
+	}
+
+	return lines, err
+}