Add portForwards.guestIPZero property

When guestIPZero is set the rule will only match if the bind is against
literal 0.0.0.0 and not any other interface.

Signed-off-by: Jan Dubois <jan.dubois@suse.com>

Author: jandubois

pkg/hostagent/port.go

@@ -52,7 +52,9 @@ func (pf *portForwarder) forwardingAddresses(guest api.IPPort) (string, string)
 		case guest.IP.IsUnspecified():
 		case guest.IP.Equal(rule.GuestIP):
 		case guest.IP.Equal(net.IPv6loopback) && rule.GuestIP.Equal(api.IPv4loopback1):
-		case rule.GuestIP.IsUnspecified():
+		case rule.GuestIP.IsUnspecified() && !rule.GuestIPZero:
+			// When GuestIPZero is true, then 0.0.0.0 must be an exact match, which is already
+			// handled above by the guest.IP.IsUnspecified() condition.
 		default:
 			continue
 		}

pkg/limayaml/defaults.go

@@ -402,7 +402,11 @@ func FillPortForwardDefaults(rule *PortForward, instDir string) {
 		rule.Proto = TCP
 	}
 	if rule.GuestIP == nil {
-		rule.GuestIP = api.IPv4loopback1
+		if rule.GuestIPZero {
+			rule.GuestIP = net.IPv4zero
+		} else {
+			rule.GuestIP = api.IPv4loopback1
+		}
 	}
 	if rule.HostIP == nil {
 		rule.HostIP = api.IPv4loopback1

pkg/limayaml/limayaml.go

@@ -112,6 +112,7 @@ const (
 )
 
 type PortForward struct {
+	GuestIPZero    bool   `yaml:"guestIPZero,omitempty" json:"guestIPZero,omitempty"`
 	GuestIP        net.IP `yaml:"guestIP,omitempty" json:"guestIP,omitempty"`
 	GuestPort      int    `yaml:"guestPort,omitempty" json:"guestPort,omitempty"`
 	GuestPortRange [2]int `yaml:"guestPortRange,omitempty" json:"guestPortRange,omitempty"`

pkg/limayaml/validate.go

@@ -134,6 +134,9 @@ func Validate(y LimaYAML, warn bool) error {
 	}
 	for i, rule := range y.PortForwards {
 		field := fmt.Sprintf("portForwards[%d]", i)
+		if rule.GuestIPZero && !rule.GuestIP.Equal(net.IPv4zero) {
+			return fmt.Errorf("field `%s.guestIPZero` can only be true when field `%s.guestIP` is 0.0.0.0", field, field)
+		}
 		if rule.GuestPort != 0 {
 			if rule.GuestSocket != "" {
 				return fmt.Errorf("field `%s.guestPort` must be 0 when field `%s.guestSocket` is set", field, field)