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

186
hscontrol/policy/v2/testdata/grant_results/GRANT-F2.json vendored
View file

@ -50,7 +50,13 @@
"src": ["autogroup:member"],
"dst": ["tag:server"],
"ip": ["*"],
"app": { "example.com/cap/test": [{ "role": "admin" }] }
"app": {
"example.com/cap/test": [
{
"role": "admin"
}
]
}
}
],
"api_endpoint": "https://api.tailscale.com/api/v2/tailnet/kratail2tid%40passkey/acl",
@ -75,7 +81,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",
@ -330,8 +338,20 @@
"fd7a:115c:a1e0::9e37:5a52"
],
"DstPorts": [
{ "IP": "100.108.74.26", "Ports": { "First": 0, "Last": 65535 } },
{ "IP": "fd7a:115c:a1e0::b901:4a87", "Ports": { "First": 0, "Last": 65535 } }
{
"IP": "100.108.74.26",
"Ports": {
"First": 0,
"Last": 65535
}
},
{
"IP": "fd7a:115c:a1e0::b901:4a87",
"Ports": {
"First": 0,
"Last": 65535
}
}
]
},
{
@ -346,7 +366,13 @@
"CapGrant": [
{
"Dsts": ["100.108.74.26/32", "fd7a:115c:a1e0::b901:4a87/128"],
"CapMap": { "example.com/cap/test": [{ "role": "admin" }] }
"CapMap": {
"example.com/cap/test": [
{
"role": "admin"
}
]
}
}
]
}
@ -364,8 +390,20 @@
],
"SrcCaps": null,
"Dsts": [
{ "Net": "100.108.74.26/32", "Ports": { "First": 0, "Last": 65535 } },
{ "Net": "fd7a:115c:a1e0::b901:4a87/128", "Ports": { "First": 0, "Last": 65535 } }
{
"Net": "100.108.74.26/32",
"Ports": {
"First": 0,
"Last": 65535
}
},
{
"Net": "fd7a:115c:a1e0::b901:4a87/128",
"Ports": {
"First": 0,
"Last": 65535
}
}
],
"Caps": []
},
@ -382,8 +420,24 @@
"SrcCaps": null,
"Dsts": [],
"Caps": [
{ "Dst": "100.108.74.26/32", "Cap": "example.com/cap/test", "Values": [{ "role": "admin" }] },
{ "Dst": "fd7a:115c:a1e0::b901:4a87/128", "Cap": "example.com/cap/test", "Values": [{ "role": "admin" }] }
{
"Dst": "100.108.74.26/32",
"Cap": "example.com/cap/test",
"Values": [
{
"role": "admin"
}
]
},
{
"Dst": "fd7a:115c:a1e0::b901:4a87/128",
"Cap": "example.com/cap/test",
"Values": [
{
"role": "admin"
}
]
}
]
}
],
@ -434,8 +488,14 @@
"OS": "linux",
"Hostname": "user-kris",
"Services": [
{ "Proto": "peerapi4", "Port": 40159 },
{ "Proto": "peerapi6", "Port": 40159 }
{
"Proto": "peerapi4",
"Port": 40159
},
{
"Proto": "peerapi6",
"Port": 40159
}
]
},
"Created": "2026-02-20T14:09:34.803901523Z",
@ -444,8 +504,18 @@
"ComputedName": "user-kris",
"ComputedNameWithHost": "user-kris"
},
"UserProfile": { "ID": 4538565228176803, "LoginName": "kristoffer@dalby.cc", "DisplayName": "kristoffer" },
"CapMap": { "example.com/cap/test": [{ "role": "admin" }] }
"UserProfile": {
"ID": 4538565228176803,
"LoginName": "kristoffer@dalby.cc",
"DisplayName": "kristoffer"
},
"CapMap": {
"example.com/cap/test": [
{
"role": "admin"
}
]
}
}
},
"100.103.90.82": {
@ -474,8 +544,14 @@
"OS": "linux",
"Hostname": "user-mon",
"Services": [
{ "Proto": "peerapi4", "Port": 33201 },
{ "Proto": "peerapi6", "Port": 33201 }
{
"Proto": "peerapi4",
"Port": 33201
},
{
"Proto": "peerapi6",
"Port": 33201
}
]
},
"Created": "2026-02-20T14:09:00.203639664Z",
@ -489,7 +565,13 @@
"LoginName": "monitorpasskeykradalby@passkey",
"DisplayName": "monitorpasskeykradalby"
},
"CapMap": { "example.com/cap/test": [{ "role": "admin" }] }
"CapMap": {
"example.com/cap/test": [
{
"role": "admin"
}
]
}
}
},
"100.90.199.68": {
@ -518,8 +600,14 @@
"OS": "linux",
"Hostname": "user1",
"Services": [
{ "Proto": "peerapi4", "Port": 46708 },
{ "Proto": "peerapi6", "Port": 46708 }
{
"Proto": "peerapi4",
"Port": 46708
},
{
"Proto": "peerapi6",
"Port": 46708
}
]
},
"Created": "2026-01-23T10:04:13.531671894Z",
@ -528,8 +616,18 @@
"ComputedName": "user1",
"ComputedNameWithHost": "user1"
},
"UserProfile": { "ID": 4156223528223174, "LoginName": "kratail2tid@passkey", "DisplayName": "kratail2tid" },
"CapMap": { "example.com/cap/test": [{ "role": "admin" }] }
"UserProfile": {
"ID": 4156223528223174,
"LoginName": "kratail2tid@passkey",
"DisplayName": "kratail2tid"
},
"CapMap": {
"example.com/cap/test": [
{
"role": "admin"
}
]
}
}
}
}
@ -587,8 +685,14 @@
"OS": "linux",
"Hostname": "tagged-server",
"Services": [
{ "Proto": "peerapi4", "Port": 46499 },
{ "Proto": "peerapi6", "Port": 46499 }
{
"Proto": "peerapi4",
"Port": 46499
},
{
"Proto": "peerapi6",
"Port": 46499
}
]
},
"Created": "2026-01-23T10:10:26.365653609Z",
@ -598,7 +702,11 @@
"ComputedName": "tagged-server",
"ComputedNameWithHost": "tagged-server"
},
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
"UserProfile": {
"ID": 1260082990019555,
"LoginName": "tagged-devices",
"DisplayName": "Tagged Devices"
},
"CapMap": null
}
},
@ -667,8 +775,14 @@
"OS": "linux",
"Hostname": "tagged-server",
"Services": [
{ "Proto": "peerapi4", "Port": 46499 },
{ "Proto": "peerapi6", "Port": 46499 }
{
"Proto": "peerapi4",
"Port": 46499
},
{
"Proto": "peerapi6",
"Port": 46499
}
]
},
"Created": "2026-01-23T10:10:26.365653609Z",
@ -678,7 +792,11 @@
"ComputedName": "tagged-server",
"ComputedNameWithHost": "tagged-server"
},
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
"UserProfile": {
"ID": 1260082990019555,
"LoginName": "tagged-devices",
"DisplayName": "Tagged Devices"
},
"CapMap": null
}
},
@ -747,8 +865,14 @@
"OS": "linux",
"Hostname": "tagged-server",
"Services": [
{ "Proto": "peerapi4", "Port": 46499 },
{ "Proto": "peerapi6", "Port": 46499 }
{
"Proto": "peerapi4",
"Port": 46499
},
{
"Proto": "peerapi6",
"Port": 46499
}
]
},
"Created": "2026-01-23T10:10:26.365653609Z",
@ -758,7 +882,11 @@
"ComputedName": "tagged-server",
"ComputedNameWithHost": "tagged-server"
},
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
"UserProfile": {
"ID": 1260082990019555,
"LoginName": "tagged-devices",
"DisplayName": "Tagged Devices"
},
"CapMap": null
}
},