rsp2k/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

policy/v2: add advertised routes to compat test topologies

Browse source 
Add routable_ips and approved_routes fields to the node topology
definitions in all golden test files. These represent the subnet
routes actually advertised by nodes on the Tailscale SaaS network
during data capture:

  Routes topology (92 files, 6 router nodes):
    big-router:     10.0.0.0/8
    subnet-router:  10.33.0.0/16
    ha-router1:     192.168.1.0/24
    ha-router2:     192.168.1.0/24
    multi-router:   172.16.0.0/24
    exit-node:      0.0.0.0/0, ::/0

  ACL topology (199 files, 1 router node):
    subnet-router:  10.33.0.0/16

  Grants topology (203 files, 1 router node):
    subnet-router:  10.33.0.0/16

The route assignments were deduced from the golden data by analyzing
which router nodes receive FilterRules for which destination CIDRs
across all test files, and cross-referenced with the MTS setup
script (setup_grant_nodes.sh).

Updates #2180
This commit is contained in:
Kristoffer Dalby 2026-03-18 13:40:19 +00:00
parent 927ce418d2
commit 995ed0187c
494 changed files with 76022 additions and 15770 deletions
Download patch file Download diff file Expand all files Collapse all files

60
hscontrol/policy/v2/testdata/grant_results/GRANT-K27.json vendored
View file

@ -41,7 +41,13 @@
]
},
"grants_section": [
{ "src": ["autogroup:member"], "dst": ["autogroup:self"], "app": { "example.com/cap/self-service": [{}] } }
{
"src": ["autogroup:member"],
"dst": ["autogroup:self"],
"app": {
"example.com/cap/self-service": [{}]
}
}
],
"api_endpoint": "https://api.tailscale.com/api/v2/tailnet/kratail2tid%40passkey/acl",
"api_method": "POST",
@ -65,7 +71,9 @@
"user_id": 7489538288452506,
"tags": ["tag:router"],
"ipv4": "100.92.142.61",
"ipv6": "fd7a:115c:a1e0::3e37:8e3d"
"ipv6": "fd7a:115c:a1e0::3e37:8e3d",
"routable_ips": ["10.33.0.0/16"],
"approved_routes": ["10.33.0.0/16"]
},
"tagged-client": {
"mts_name": "tagged-client",
@ -360,7 +368,9 @@
"CapGrant": [
{
"Dsts": ["100.110.121.96/32", "fd7a:115c:a1e0::1737:7960/128"],
"CapMap": { "example.com/cap/self-service": [{}] }
"CapMap": {
"example.com/cap/self-service": [{}]
}
}
]
}
@ -372,8 +382,16 @@
"SrcCaps": null,
"Dsts": [],
"Caps": [
{ "Dst": "100.110.121.96/32", "Cap": "example.com/cap/self-service", "Values": [{}] },
{ "Dst": "fd7a:115c:a1e0::1737:7960/128", "Cap": "example.com/cap/self-service", "Values": [{}] }
{
"Dst": "100.110.121.96/32",
"Cap": "example.com/cap/self-service",
"Values": [{}]
},
{
"Dst": "fd7a:115c:a1e0::1737:7960/128",
"Cap": "example.com/cap/self-service",
"Values": [{}]
}
]
}
],
@ -426,7 +444,9 @@
"CapGrant": [
{
"Dsts": ["100.103.90.82/32", "fd7a:115c:a1e0::9e37:5a52/128"],
"CapMap": { "example.com/cap/self-service": [{}] }
"CapMap": {
"example.com/cap/self-service": [{}]
}
}
]
}
@ -438,8 +458,16 @@
"SrcCaps": null,
"Dsts": [],
"Caps": [
{ "Dst": "100.103.90.82/32", "Cap": "example.com/cap/self-service", "Values": [{}] },
{ "Dst": "fd7a:115c:a1e0::9e37:5a52/128", "Cap": "example.com/cap/self-service", "Values": [{}] }
{
"Dst": "100.103.90.82/32",
"Cap": "example.com/cap/self-service",
"Values": [{}]
},
{
"Dst": "fd7a:115c:a1e0::9e37:5a52/128",
"Cap": "example.com/cap/self-service",
"Values": [{}]
}
]
}
],
@ -492,7 +520,9 @@
"CapGrant": [
{
"Dsts": ["100.90.199.68/32", "fd7a:115c:a1e0::2d01:c747/128"],
"CapMap": { "example.com/cap/self-service": [{}] }
"CapMap": {
"example.com/cap/self-service": [{}]
}
}
]
}
@ -504,8 +534,16 @@
"SrcCaps": null,
"Dsts": [],
"Caps": [
{ "Dst": "100.90.199.68/32", "Cap": "example.com/cap/self-service", "Values": [{}] },
{ "Dst": "fd7a:115c:a1e0::2d01:c747/128", "Cap": "example.com/cap/self-service", "Values": [{}] }
{
"Dst": "100.90.199.68/32",
"Cap": "example.com/cap/self-service",
"Values": [{}]
},
{
"Dst": "fd7a:115c:a1e0::2d01:c747/128",
"Cap": "example.com/cap/self-service",
"Values": [{}]
}
]
}
],