starred/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-04-19 15:21:35 +02:00
Code Issues 98 Packages Projects Releases 10 Wiki Activity

policy/v2: use bare IPs in autogroup:self DstPorts

Browse Source 
Use ip.String() instead of netip.PrefixFrom(ip, ip.BitLen()).String()
when building DstPorts for autogroup:self destinations. This produces
bare IPs like "100.90.199.68" instead of CIDR notation like
"100.90.199.68/32", matching the Tailscale FilterRule wire format.

Updates #2180
This commit is contained in:
Kristoffer Dalby
2026-03-18 10:39:55 +00:00
parent e3ab288351
commit bc9877ce28
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hscontrol/policy/v2/filter.go
View File

@@ -3,7 +3,6 @@ package v2
import ( import (
"errors" "errors"
"fmt" "fmt"
"net/netip"
"slices" "slices"
"strconv" "strconv"
"strings" "strings"
@@ -135,6 +134,7 @@ func (pol *Policy) destinationsToNetPortRange(
if pref.IsSingleIP() { if pref.IsSingleIP() {
pr.IP = pref.Addr().String() pr.IP = pref.Addr().String()
} }
ret = append(ret, pr) ret = append(ret, pr)
} }
} }
@@ -260,7 +260,7 @@ func (pol *Policy) compileGrantWithAutogroupSelf(
for _, port := range ipp.Ports { for _, port := range ipp.Ports {
for _, ip := range n.IPs() { for _, ip := range n.IPs() {
destPorts = append(destPorts, tailcfg.NetPortRange{ destPorts = append(destPorts, tailcfg.NetPortRange{
IP: netip.PrefixFrom(ip, ip.BitLen()).String(), IP: ip.String(),
Ports: port, Ports: port,
}) })
} }

2
hscontrol/policy/v2/filter_test.go
View File

@@ -1846,7 +1846,7 @@ func TestAutogroupSelfWithSpecificUserSource(t *testing.T) {
actualDestIPs = append(actualDestIPs, dst.IP) actualDestIPs = append(actualDestIPs, dst.IP)
} }
expectedDestIPs := []string{"100.64.0.1/32", "100.64.0.2/32"} expectedDestIPs := []string{"100.64.0.1", "100.64.0.2"}
assert.ElementsMatch(t, expectedDestIPs, actualDestIPs) assert.ElementsMatch(t, expectedDestIPs, actualDestIPs)
node2 := nodes[2].View() node2 := nodes[2].View()