towk/magellan
1
0
Fork 0
mirror of https://github.com/davidallendj/magellan.git synced 2025-12-20 03:27:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed GenerateHosts implementation to take IP, CIDR, and subnet masks arguments for scanning

Browse source
This commit is contained in:
David J. Allen 2023-10-17 14:45:35 -06:00
parent 555ecf679d
commit 48b2264053
3 changed files with 46 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cmd/scan.go
View file

@ -2,6 +2,7 @@ package cmd
import (
"fmt"
"net"
"os"
"path"
@ -16,7 +17,7 @@ var (
begin uint8
end uint8
subnets []string
subnetMasks []string
subnetMasks []net.IP
disableProbing bool
)
@ -30,14 +31,20 @@ var scanCmd = &cobra.Command{
hostsToScan = hosts
} else {
for i, subnet := range subnets {
if len(subnetMasks) > 0 {
hostsToScan = append(hostsToScan, magellan.GenerateHostsWithSubnet(subnet, subnetMasks[i])...)
} else {
hostsToScan = append(hostsToScan, magellan.GenerateHosts(subnet)...)
if len(subnet) <= 0 {
return
}
if len(subnetMasks) < i + 1 {
subnetMasks = append(subnetMasks, net.IP{255, 255, 255, 0})
}
hostsToScan = append(hostsToScan, magellan.GenerateHosts(subnet, &subnetMasks[i])...)
}
}
fmt.Printf("hosts to scan: %v\n", hostsToScan)
// set ports to use for scanning
portsToScan := []int{}
if len(ports) > 0 {
@ -71,7 +78,7 @@ func init() {
// scanCmd.Flags().Uint8Var(&begin, "begin", 0, "set the starting point for range of IP addresses")
// scanCmd.Flags().Uint8Var(&end, "end", 255, "set the ending point for range of IP addresses")
scanCmd.Flags().StringSliceVar(&subnets, "subnet", []string{}, "set additional subnets")
scanCmd.Flags().StringSliceVar(&subnetMasks, "subnet-mask", []string{}, "set the subnet masks to use for network")
scanCmd.Flags().IPSliceVar(&subnetMasks, "subnet-mask", []net.IP{}, "set the subnet masks to use for network")
scanCmd.Flags().BoolVar(&disableProbing, "disable-probing", false, "disable probing scanned results for BMC nodes")
rootCmd.AddCommand(scanCmd)