Merge branch 'bf-icmp-disabling-override'

Author: eze-kiel

scan/scan.go

@@ -101,8 +101,24 @@ func (s *Scanner) Start(c *config.Conf) error {
 		// | "x"    | ""     | true   |   x    |
 		// | "x"    | "0"    | false  |   -    |
 		// | "x"    | "y"    | true   |   y    |
-		if target.icmpPeriod != "" && target.icmpPeriod != "0" {
-			target.doPing = true
+		switch c.IcmpPeriod {
+		case "", "0":
+			if target.icmpPeriod != "" && target.icmpPeriod != "0" {
+				target.doPing = true
+			}
+		default:
+			if target.icmpPeriod != "0" {
+				target.doPing = true
+				if target.icmpPeriod == "" {
+					target.icmpPeriod = c.IcmpPeriod
+				}
+			}
+		}
+		// Inform that ping is disabled
+		if !target.doPing {
+			s.Logger.Warn().Msgf("ping explicitly disabled for %s (%s) in configuration",
+				target.name,
+				target.ip)
 		}
 
 		// Read target's expected port range
@@ -122,10 +138,6 @@ func (s *Scanner) Start(c *config.Conf) error {
 			continue
 		}
 
-		if target.icmpPeriod != "" {
-			target.doPing = true
-		}
-
 		// If TCP period or ports range has been provided, it means that we want
 		// to do TCP scan on the target
 		if target.tcpPeriod != "" || target.ports != "" || len(target.expected) != 0 {