policy/v2: add advertised routes to compat test topologies

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

View file

@ -56,8 +56,28 @@
]
},
"grants_section": [
{ "src": ["*"], "dst": ["tag:server"], "app": { "example.com/cap/test": [{ "v": 1 }] } },
{ "src": ["*"], "dst": ["tag:server"], "app": { "example.com/cap/test": [{ "v": 2 }] } }
{
"src": ["*"],
"dst": ["tag:server"],
"app": {
"example.com/cap/test": [
{
"v": 1
}
]
}
},
{
"src": ["*"],
"dst": ["tag:server"],
"app": {
"example.com/cap/test": [
{
"v": 2
}
]
}
}
],
"api_endpoint": "https://api.tailscale.com/api/v2/tailnet/kratail2tid%40passkey/acl",
"api_method": "POST",
@ -81,7 +101,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",
@ -188,8 +210,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",
@ -199,7 +227,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
}
},
@ -268,8 +300,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",
@ -279,7 +317,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
}
},
@ -348,8 +390,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",
@ -359,7 +407,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
}
},
@ -428,8 +480,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",
@ -439,7 +497,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
}
},
@ -476,7 +538,13 @@
"CapGrant": [
{
"Dsts": ["100.108.74.26/32", "fd7a:115c:a1e0::b901:4a87/128"],
"CapMap": { "example.com/cap/test": [{ "v": 1 }] }
"CapMap": {
"example.com/cap/test": [
{
"v": 1
}
]
}
}
]
},
@ -490,7 +558,13 @@
"CapGrant": [
{
"Dsts": ["100.108.74.26/32", "fd7a:115c:a1e0::b901:4a87/128"],
"CapMap": { "example.com/cap/test": [{ "v": 2 }] }
"CapMap": {
"example.com/cap/test": [
{
"v": 2
}
]
}
}
]
}
@ -518,8 +592,24 @@
"SrcCaps": null,
"Dsts": [],
"Caps": [
{ "Dst": "100.108.74.26/32", "Cap": "example.com/cap/test", "Values": [{ "v": 1 }] },
{ "Dst": "fd7a:115c:a1e0::b901:4a87/128", "Cap": "example.com/cap/test", "Values": [{ "v": 1 }] }
{
"Dst": "100.108.74.26/32",
"Cap": "example.com/cap/test",
"Values": [
{
"v": 1
}
]
},
{
"Dst": "fd7a:115c:a1e0::b901:4a87/128",
"Cap": "example.com/cap/test",
"Values": [
{
"v": 1
}
]
}
]
},
{
@ -544,8 +634,24 @@
"SrcCaps": null,
"Dsts": [],
"Caps": [
{ "Dst": "100.108.74.26/32", "Cap": "example.com/cap/test", "Values": [{ "v": 2 }] },
{ "Dst": "fd7a:115c:a1e0::b901:4a87/128", "Cap": "example.com/cap/test", "Values": [{ "v": 2 }] }
{
"Dst": "100.108.74.26/32",
"Cap": "example.com/cap/test",
"Values": [
{
"v": 2
}
]
},
{
"Dst": "fd7a:115c:a1e0::b901:4a87/128",
"Cap": "example.com/cap/test",
"Values": [
{
"v": 2
}
]
}
]
}
],
@ -575,8 +681,14 @@
"OS": "linux",
"Hostname": "exit-node",
"Services": [
{ "Proto": "peerapi4", "Port": 37000 },
{ "Proto": "peerapi6", "Port": 37000 }
{
"Proto": "peerapi4",
"Port": 37000
},
{
"Proto": "peerapi6",
"Port": 37000
}
]
},
"Created": "2026-02-23T00:13:20.566112173Z",
@ -586,8 +698,21 @@
"ComputedName": "exit-node",
"ComputedNameWithHost": "exit-node"
},
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
"CapMap": { "example.com/cap/test": [{ "v": 1 }, { "v": 2 }] }
"UserProfile": {
"ID": 1260082990019555,
"LoginName": "tagged-devices",
"DisplayName": "Tagged Devices"
},
"CapMap": {
"example.com/cap/test": [
{
"v": 1
},
{
"v": 2
}
]
}
}
},
"100.92.142.61": {
@ -615,8 +740,14 @@
"OS": "linux",
"Hostname": "subnet-router",
"Services": [
{ "Proto": "peerapi4", "Port": 63250 },
{ "Proto": "peerapi6", "Port": 63250 }
{
"Proto": "peerapi4",
"Port": 63250
},
{
"Proto": "peerapi6",
"Port": 63250
}
]
},
"Created": "2026-02-23T00:13:15.731478784Z",
@ -627,8 +758,21 @@
"ComputedName": "subnet-router",
"ComputedNameWithHost": "subnet-router"
},
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
"CapMap": { "example.com/cap/test": [{ "v": 1 }, { "v": 2 }] }
"UserProfile": {
"ID": 1260082990019555,
"LoginName": "tagged-devices",
"DisplayName": "Tagged Devices"
},
"CapMap": {
"example.com/cap/test": [
{
"v": 1
},
{
"v": 2
}
]
}
}
},
"100.83.200.69": {
@ -656,8 +800,14 @@
"OS": "linux",
"Hostname": "tagged-client",
"Services": [
{ "Proto": "peerapi4", "Port": 41378 },
{ "Proto": "peerapi6", "Port": 41378 }
{
"Proto": "peerapi4",
"Port": 41378
},
{
"Proto": "peerapi6",
"Port": 41378
}
]
},
"Created": "2026-02-23T00:13:11.017324028Z",
@ -667,8 +817,21 @@
"ComputedName": "tagged-client",
"ComputedNameWithHost": "tagged-client"
},
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
"CapMap": { "example.com/cap/test": [{ "v": 1 }, { "v": 2 }] }
"UserProfile": {
"ID": 1260082990019555,
"LoginName": "tagged-devices",
"DisplayName": "Tagged Devices"
},
"CapMap": {
"example.com/cap/test": [
{
"v": 1
},
{
"v": 2
}
]
}
}
},
"100.103.8.15": {
@ -696,8 +859,14 @@
"OS": "linux",
"Hostname": "tagged-prod",
"Services": [
{ "Proto": "peerapi4", "Port": 37678 },
{ "Proto": "peerapi6", "Port": 37678 }
{
"Proto": "peerapi4",
"Port": 37678
},
{
"Proto": "peerapi6",
"Port": 37678
}
]
},
"Created": "2026-02-20T14:03:12.89283153Z",
@ -707,8 +876,21 @@
"ComputedName": "tagged-prod",
"ComputedNameWithHost": "tagged-prod"
},
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
"CapMap": { "example.com/cap/test": [{ "v": 1 }, { "v": 2 }] }
"UserProfile": {
"ID": 1260082990019555,
"LoginName": "tagged-devices",
"DisplayName": "Tagged Devices"
},
"CapMap": {
"example.com/cap/test": [
{
"v": 1
},
{
"v": 2
}
]
}
}
},
"100.110.121.96": {
@ -737,8 +919,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",
@ -747,8 +935,21 @@
"ComputedName": "user-kris",
"ComputedNameWithHost": "user-kris"
},
"UserProfile": { "ID": 4538565228176803, "LoginName": "kristoffer@dalby.cc", "DisplayName": "kristoffer" },
"CapMap": { "example.com/cap/test": [{ "v": 1 }, { "v": 2 }] }
"UserProfile": {
"ID": 4538565228176803,
"LoginName": "kristoffer@dalby.cc",
"DisplayName": "kristoffer"
},
"CapMap": {
"example.com/cap/test": [
{
"v": 1
},
{
"v": 2
}
]
}
}
},
"100.103.90.82": {
@ -777,8 +978,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",
@ -792,7 +999,16 @@
"LoginName": "monitorpasskeykradalby@passkey",
"DisplayName": "monitorpasskeykradalby"
},
"CapMap": { "example.com/cap/test": [{ "v": 1 }, { "v": 2 }] }
"CapMap": {
"example.com/cap/test": [
{
"v": 1
},
{
"v": 2
}
]
}
}
},
"100.90.199.68": {
@ -821,8 +1037,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",
@ -831,8 +1053,21 @@
"ComputedName": "user1",
"ComputedNameWithHost": "user1"
},
"UserProfile": { "ID": 4156223528223174, "LoginName": "kratail2tid@passkey", "DisplayName": "kratail2tid" },
"CapMap": { "example.com/cap/test": [{ "v": 1 }, { "v": 2 }] }
"UserProfile": {
"ID": 4156223528223174,
"LoginName": "kratail2tid@passkey",
"DisplayName": "kratail2tid"
},
"CapMap": {
"example.com/cap/test": [
{
"v": 1
},
{
"v": 2
}
]
}
}
}
}
@ -890,8 +1125,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",
@ -901,7 +1142,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
}
},
@ -970,8 +1215,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",
@ -981,7 +1232,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
}
},
@ -1050,8 +1305,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",
@ -1061,7 +1322,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
}
},