Backport of fix 'default' alias not added to interface specified by `…

…network_interface` into release/1.5.x (#18115)

This pull request was automerged via backport-assistant

.changelog/18096.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+fingerprint: fix 'default' alias not being added to interface specified by network_interface
+```

client/fingerprint/network.go

@@ -244,18 +244,14 @@ func deriveAddressAliases(iface net.Interface, addr net.IP, config *config.Confi
 		}
 	}
 
-	if len(aliases) > 0 {
-		return
-	}
-
 	if config.NetworkInterface != "" {
 		if config.NetworkInterface == iface.Name {
-			return []string{"default"}
+			aliases = append(aliases, "default")
 		}
 	} else if ri, err := sockaddr.NewRouteInfo(); err == nil {
 		defaultIface, err := ri.GetDefaultInterfaceName()
 		if err == nil && iface.Name == defaultIface {
-			return []string{"default"}
+			aliases = append(aliases, "default")
 		}
 	}
 

client/fingerprint/network_test.go

@@ -497,6 +497,9 @@ func TestNetworkFingerPrint_MultipleAliases(t *testing.T) {
 	for alias := range cfg.HostNetworks {
 		expected = append(expected, alias)
 	}
+	// eth3 matches the NetworkInterface and will then generate the 'default'
+	// alias
+	expected = append(expected, "default")
 	sort.Strings(expected)
 	sort.Strings(aliases)
 	require.Equal(t, expected, aliases, "host networks should match aliases")
@@ -534,7 +537,7 @@ func TestNetworkFingerPrint_HostNetworkReservedPorts(t *testing.T) {
 					CIDR:      "100.64.0.11/10",
 				},
 			},
-			expected: []string{"", "", ""},
+			expected: []string{"", "", "", ""},
 		},
 		{
 			name: "reserved ports in some aliases",
@@ -557,7 +560,7 @@ func TestNetworkFingerPrint_HostNetworkReservedPorts(t *testing.T) {
 					CIDR:      "100.64.0.11/10",
 				},
 			},
-			expected: []string{"22", "80,3000-4000", ""},
+			expected: []string{"22", "80,3000-4000", "", ""},
 		},
 	}