fix(provider): do not blindly use first IP for SSH (#704)

For SSH access, try in order: - IPv4 address of the interface with IPv4 Gateway (if there is one) - IPv6 address of the interface with IPv6 Gateway (if there is one) - fallback to the first interface with IPv4 address Signed-off-by: Oto Petřík <[email protected]> Co-authored-by: Pavel Boldyrev <[email protected]>
bpg · Nov 10, 2023 · a586d03 · a586d03
1 parent d2b8ce1
commit a586d03
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/fwprovider/provider.go b/fwprovider/provider.go
@@ -407,13 +407,34 @@ func (r *apiResolver) Resolve(ctx context.Context, nodeName string) (ssh.Proxmox
 
 	nodeAddress := ""
 
+	// try IPv4 address on the interface with IPv4 gateway
 	for _, d := range networkDevices {
-		if d.Address != nil {
+		if d.Gateway != nil && d.Address != nil {
 			nodeAddress = *d.Address
 			break
 		}
 	}
 
+	if nodeAddress == "" {
+		// fallback 1: try IPv6 address on the interface with IPv6 gateway
+		for _, d := range networkDevices {
+			if d.Gateway6 != nil && d.Address6 != nil {
+				nodeAddress = *d.Address6
+				break
+			}
+		}
+	}
+
+	if nodeAddress == "" {
+		// fallback 2: use first interface with any IPv4 address
+		for _, d := range networkDevices {
+			if d.Address != nil {
+				nodeAddress = *d.Address
+				break
+			}
+		}
+	}
+
 	if nodeAddress == "" {
 		return ssh.ProxmoxNode{}, fmt.Errorf("failed to determine the IP address of node \"%s\"", nc.NodeName)
 	}

diff --git a/proxmoxtf/provider/provider.go b/proxmoxtf/provider/provider.go
@@ -181,13 +181,34 @@ func (r *apiResolver) Resolve(ctx context.Context, nodeName string) (ssh.Proxmox
 
 	nodeAddress := ""
 
+	// try IPv4 address on the interface with IPv4 gateway
 	for _, d := range networkDevices {
-		if d.Address != nil {
+		if d.Gateway != nil && d.Address != nil {
 			nodeAddress = *d.Address
 			break
 		}
 	}
 
+	if nodeAddress == "" {
+		// fallback 1: try IPv6 address on the interface with IPv6 gateway
+		for _, d := range networkDevices {
+			if d.Gateway6 != nil && d.Address6 != nil {
+				nodeAddress = *d.Address6
+				break
+			}
+		}
+	}
+
+	if nodeAddress == "" {
+		// fallback 2: use first interface with any IPv4 address
+		for _, d := range networkDevices {
+			if d.Address != nil {
+				nodeAddress = *d.Address
+				break
+			}
+		}
+	}
+
 	if nodeAddress == "" {
 		return ssh.ProxmoxNode{}, fmt.Errorf("failed to determine the IP address of node \"%s\"", nc.NodeName)
 	}