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
parent
927ce418d2
commit
995ed0187c
494 changed files with 76022 additions and 15770 deletions
|
|
@ -38,7 +38,13 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"grants_section": [{ "src": ["*"], "dst": ["10.33.0.0/16"], "ip": ["80-443"] }],
|
||||
"grants_section": [
|
||||
{
|
||||
"src": ["*"],
|
||||
"dst": ["10.33.0.0/16"],
|
||||
"ip": ["80-443"]
|
||||
}
|
||||
],
|
||||
"api_endpoint": "https://api.tailscale.com/api/v2/tailnet/kratail2tid%40passkey/acl",
|
||||
"api_method": "POST",
|
||||
"api_response_code": 200
|
||||
|
|
@ -61,7 +67,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",
|
||||
|
|
@ -153,8 +161,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",
|
||||
|
|
@ -165,7 +179,11 @@
|
|||
"ComputedName": "subnet-router",
|
||||
"ComputedNameWithHost": "subnet-router"
|
||||
},
|
||||
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
|
||||
"UserProfile": {
|
||||
"ID": 1260082990019555,
|
||||
"LoginName": "tagged-devices",
|
||||
"DisplayName": "Tagged Devices"
|
||||
},
|
||||
"CapMap": null
|
||||
}
|
||||
},
|
||||
|
|
@ -214,7 +232,15 @@
|
|||
"100.64.0.0-100.115.91.255",
|
||||
"fd7a:115c:a1e0::/48"
|
||||
],
|
||||
"DstPorts": [{ "IP": "10.33.0.0/16", "Ports": { "First": 80, "Last": 443 } }]
|
||||
"DstPorts": [
|
||||
{
|
||||
"IP": "10.33.0.0/16",
|
||||
"Ports": {
|
||||
"First": 80,
|
||||
"Last": 443
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"packet_filter_matches": [
|
||||
|
|
@ -238,7 +264,15 @@
|
|||
"fd7a:115c:a1e0::/48"
|
||||
],
|
||||
"SrcCaps": null,
|
||||
"Dsts": [{ "Net": "10.33.0.0/16", "Ports": { "First": 80, "Last": 443 } }],
|
||||
"Dsts": [
|
||||
{
|
||||
"Net": "10.33.0.0/16",
|
||||
"Ports": {
|
||||
"First": 80,
|
||||
"Last": 443
|
||||
}
|
||||
}
|
||||
],
|
||||
"Caps": []
|
||||
}
|
||||
],
|
||||
|
|
@ -268,8 +302,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",
|
||||
|
|
@ -279,7 +319,11 @@
|
|||
"ComputedName": "exit-node",
|
||||
"ComputedNameWithHost": "exit-node"
|
||||
},
|
||||
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
|
||||
"UserProfile": {
|
||||
"ID": 1260082990019555,
|
||||
"LoginName": "tagged-devices",
|
||||
"DisplayName": "Tagged Devices"
|
||||
},
|
||||
"CapMap": null
|
||||
}
|
||||
},
|
||||
|
|
@ -308,8 +352,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",
|
||||
|
|
@ -319,7 +369,11 @@
|
|||
"ComputedName": "tagged-client",
|
||||
"ComputedNameWithHost": "tagged-client"
|
||||
},
|
||||
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
|
||||
"UserProfile": {
|
||||
"ID": 1260082990019555,
|
||||
"LoginName": "tagged-devices",
|
||||
"DisplayName": "Tagged Devices"
|
||||
},
|
||||
"CapMap": null
|
||||
}
|
||||
},
|
||||
|
|
@ -348,8 +402,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",
|
||||
|
|
@ -359,7 +419,11 @@
|
|||
"ComputedName": "tagged-prod",
|
||||
"ComputedNameWithHost": "tagged-prod"
|
||||
},
|
||||
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
|
||||
"UserProfile": {
|
||||
"ID": 1260082990019555,
|
||||
"LoginName": "tagged-devices",
|
||||
"DisplayName": "Tagged Devices"
|
||||
},
|
||||
"CapMap": null
|
||||
}
|
||||
},
|
||||
|
|
@ -388,8 +452,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",
|
||||
|
|
@ -399,7 +469,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
|
||||
}
|
||||
},
|
||||
|
|
@ -429,8 +503,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",
|
||||
|
|
@ -439,7 +519,11 @@
|
|||
"ComputedName": "user-kris",
|
||||
"ComputedNameWithHost": "user-kris"
|
||||
},
|
||||
"UserProfile": { "ID": 4538565228176803, "LoginName": "kristoffer@dalby.cc", "DisplayName": "kristoffer" },
|
||||
"UserProfile": {
|
||||
"ID": 4538565228176803,
|
||||
"LoginName": "kristoffer@dalby.cc",
|
||||
"DisplayName": "kristoffer"
|
||||
},
|
||||
"CapMap": null
|
||||
}
|
||||
},
|
||||
|
|
@ -469,8 +553,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",
|
||||
|
|
@ -513,8 +603,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",
|
||||
|
|
@ -523,7 +619,11 @@
|
|||
"ComputedName": "user1",
|
||||
"ComputedNameWithHost": "user1"
|
||||
},
|
||||
"UserProfile": { "ID": 4156223528223174, "LoginName": "kratail2tid@passkey", "DisplayName": "kratail2tid" },
|
||||
"UserProfile": {
|
||||
"ID": 4156223528223174,
|
||||
"LoginName": "kratail2tid@passkey",
|
||||
"DisplayName": "kratail2tid"
|
||||
},
|
||||
"CapMap": null
|
||||
}
|
||||
}
|
||||
|
|
@ -567,8 +667,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",
|
||||
|
|
@ -579,7 +685,11 @@
|
|||
"ComputedName": "subnet-router",
|
||||
"ComputedNameWithHost": "subnet-router"
|
||||
},
|
||||
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
|
||||
"UserProfile": {
|
||||
"ID": 1260082990019555,
|
||||
"LoginName": "tagged-devices",
|
||||
"DisplayName": "Tagged Devices"
|
||||
},
|
||||
"CapMap": null
|
||||
}
|
||||
},
|
||||
|
|
@ -648,8 +758,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",
|
||||
|
|
@ -660,7 +776,11 @@
|
|||
"ComputedName": "subnet-router",
|
||||
"ComputedNameWithHost": "subnet-router"
|
||||
},
|
||||
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
|
||||
"UserProfile": {
|
||||
"ID": 1260082990019555,
|
||||
"LoginName": "tagged-devices",
|
||||
"DisplayName": "Tagged Devices"
|
||||
},
|
||||
"CapMap": null
|
||||
}
|
||||
},
|
||||
|
|
@ -729,8 +849,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",
|
||||
|
|
@ -741,7 +867,11 @@
|
|||
"ComputedName": "subnet-router",
|
||||
"ComputedNameWithHost": "subnet-router"
|
||||
},
|
||||
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
|
||||
"UserProfile": {
|
||||
"ID": 1260082990019555,
|
||||
"LoginName": "tagged-devices",
|
||||
"DisplayName": "Tagged Devices"
|
||||
},
|
||||
"CapMap": null
|
||||
}
|
||||
},
|
||||
|
|
@ -810,8 +940,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",
|
||||
|
|
@ -822,7 +958,11 @@
|
|||
"ComputedName": "subnet-router",
|
||||
"ComputedNameWithHost": "subnet-router"
|
||||
},
|
||||
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
|
||||
"UserProfile": {
|
||||
"ID": 1260082990019555,
|
||||
"LoginName": "tagged-devices",
|
||||
"DisplayName": "Tagged Devices"
|
||||
},
|
||||
"CapMap": null
|
||||
}
|
||||
},
|
||||
|
|
@ -891,8 +1031,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",
|
||||
|
|
@ -903,7 +1049,11 @@
|
|||
"ComputedName": "subnet-router",
|
||||
"ComputedNameWithHost": "subnet-router"
|
||||
},
|
||||
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
|
||||
"UserProfile": {
|
||||
"ID": 1260082990019555,
|
||||
"LoginName": "tagged-devices",
|
||||
"DisplayName": "Tagged Devices"
|
||||
},
|
||||
"CapMap": null
|
||||
}
|
||||
},
|
||||
|
|
@ -972,8 +1122,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",
|
||||
|
|
@ -984,7 +1140,11 @@
|
|||
"ComputedName": "subnet-router",
|
||||
"ComputedNameWithHost": "subnet-router"
|
||||
},
|
||||
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
|
||||
"UserProfile": {
|
||||
"ID": 1260082990019555,
|
||||
"LoginName": "tagged-devices",
|
||||
"DisplayName": "Tagged Devices"
|
||||
},
|
||||
"CapMap": null
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue