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
|
|
@ -49,7 +49,14 @@
|
|||
{
|
||||
"src": ["autogroup:member"],
|
||||
"dst": ["tag:exit"],
|
||||
"app": { "tailscale.com/cap/drive": [{ "shares": ["*"], "access": "rw" }] }
|
||||
"app": {
|
||||
"tailscale.com/cap/drive": [
|
||||
{
|
||||
"shares": ["*"],
|
||||
"access": "rw"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"api_endpoint": "https://api.tailscale.com/api/v2/tailnet/kratail2tid%40passkey/acl",
|
||||
|
|
@ -74,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",
|
||||
|
|
@ -151,7 +160,14 @@
|
|||
"CapGrant": [
|
||||
{
|
||||
"Dsts": ["100.85.66.106/32", "fd7a:115c:a1e0::7c37:426a/128"],
|
||||
"CapMap": { "tailscale.com/cap/drive": [{ "shares": ["*"], "access": "rw" }] }
|
||||
"CapMap": {
|
||||
"tailscale.com/cap/drive": [
|
||||
{
|
||||
"shares": ["*"],
|
||||
"access": "rw"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -173,12 +189,22 @@
|
|||
{
|
||||
"Dst": "100.85.66.106/32",
|
||||
"Cap": "tailscale.com/cap/drive",
|
||||
"Values": [{ "shares": ["*"], "access": "rw" }]
|
||||
"Values": [
|
||||
{
|
||||
"shares": ["*"],
|
||||
"access": "rw"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"Dst": "fd7a:115c:a1e0::7c37:426a/128",
|
||||
"Cap": "tailscale.com/cap/drive",
|
||||
"Values": [{ "shares": ["*"], "access": "rw" }]
|
||||
"Values": [
|
||||
{
|
||||
"shares": ["*"],
|
||||
"access": "rw"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -230,8 +256,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",
|
||||
|
|
@ -240,8 +272,19 @@
|
|||
"ComputedName": "user-kris",
|
||||
"ComputedNameWithHost": "user-kris"
|
||||
},
|
||||
"UserProfile": { "ID": 4538565228176803, "LoginName": "kristoffer@dalby.cc", "DisplayName": "kristoffer" },
|
||||
"CapMap": { "tailscale.com/cap/drive": [{ "shares": ["*"], "access": "rw" }] }
|
||||
"UserProfile": {
|
||||
"ID": 4538565228176803,
|
||||
"LoginName": "kristoffer@dalby.cc",
|
||||
"DisplayName": "kristoffer"
|
||||
},
|
||||
"CapMap": {
|
||||
"tailscale.com/cap/drive": [
|
||||
{
|
||||
"shares": ["*"],
|
||||
"access": "rw"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"100.103.90.82": {
|
||||
|
|
@ -270,8 +313,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",
|
||||
|
|
@ -285,7 +334,14 @@
|
|||
"LoginName": "monitorpasskeykradalby@passkey",
|
||||
"DisplayName": "monitorpasskeykradalby"
|
||||
},
|
||||
"CapMap": { "tailscale.com/cap/drive": [{ "shares": ["*"], "access": "rw" }] }
|
||||
"CapMap": {
|
||||
"tailscale.com/cap/drive": [
|
||||
{
|
||||
"shares": ["*"],
|
||||
"access": "rw"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"100.90.199.68": {
|
||||
|
|
@ -314,8 +370,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",
|
||||
|
|
@ -324,8 +386,19 @@
|
|||
"ComputedName": "user1",
|
||||
"ComputedNameWithHost": "user1"
|
||||
},
|
||||
"UserProfile": { "ID": 4156223528223174, "LoginName": "kratail2tid@passkey", "DisplayName": "kratail2tid" },
|
||||
"CapMap": { "tailscale.com/cap/drive": [{ "shares": ["*"], "access": "rw" }] }
|
||||
"UserProfile": {
|
||||
"ID": 4156223528223174,
|
||||
"LoginName": "kratail2tid@passkey",
|
||||
"DisplayName": "kratail2tid"
|
||||
},
|
||||
"CapMap": {
|
||||
"tailscale.com/cap/drive": [
|
||||
{
|
||||
"shares": ["*"],
|
||||
"access": "rw"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -521,7 +594,9 @@
|
|||
"CapGrant": [
|
||||
{
|
||||
"Dsts": ["100.110.121.96/32", "fd7a:115c:a1e0::1737:7960/128"],
|
||||
"CapMap": { "tailscale.com/cap/drive-sharer": null }
|
||||
"CapMap": {
|
||||
"tailscale.com/cap/drive-sharer": null
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -533,8 +608,16 @@
|
|||
"SrcCaps": null,
|
||||
"Dsts": [],
|
||||
"Caps": [
|
||||
{ "Dst": "100.110.121.96/32", "Cap": "tailscale.com/cap/drive-sharer", "Values": null },
|
||||
{ "Dst": "fd7a:115c:a1e0::1737:7960/128", "Cap": "tailscale.com/cap/drive-sharer", "Values": null }
|
||||
{
|
||||
"Dst": "100.110.121.96/32",
|
||||
"Cap": "tailscale.com/cap/drive-sharer",
|
||||
"Values": null
|
||||
},
|
||||
{
|
||||
"Dst": "fd7a:115c:a1e0::1737:7960/128",
|
||||
"Cap": "tailscale.com/cap/drive-sharer",
|
||||
"Values": null
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
@ -564,8 +647,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",
|
||||
|
|
@ -575,8 +664,14 @@
|
|||
"ComputedName": "exit-node",
|
||||
"ComputedNameWithHost": "exit-node"
|
||||
},
|
||||
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
|
||||
"CapMap": { "tailscale.com/cap/drive-sharer": null }
|
||||
"UserProfile": {
|
||||
"ID": 1260082990019555,
|
||||
"LoginName": "tagged-devices",
|
||||
"DisplayName": "Tagged Devices"
|
||||
},
|
||||
"CapMap": {
|
||||
"tailscale.com/cap/drive-sharer": null
|
||||
}
|
||||
}
|
||||
},
|
||||
"100.92.142.61": {
|
||||
|
|
@ -622,7 +717,9 @@
|
|||
"CapGrant": [
|
||||
{
|
||||
"Dsts": ["100.103.90.82/32", "fd7a:115c:a1e0::9e37:5a52/128"],
|
||||
"CapMap": { "tailscale.com/cap/drive-sharer": null }
|
||||
"CapMap": {
|
||||
"tailscale.com/cap/drive-sharer": null
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -634,8 +731,16 @@
|
|||
"SrcCaps": null,
|
||||
"Dsts": [],
|
||||
"Caps": [
|
||||
{ "Dst": "100.103.90.82/32", "Cap": "tailscale.com/cap/drive-sharer", "Values": null },
|
||||
{ "Dst": "fd7a:115c:a1e0::9e37:5a52/128", "Cap": "tailscale.com/cap/drive-sharer", "Values": null }
|
||||
{
|
||||
"Dst": "100.103.90.82/32",
|
||||
"Cap": "tailscale.com/cap/drive-sharer",
|
||||
"Values": null
|
||||
},
|
||||
{
|
||||
"Dst": "fd7a:115c:a1e0::9e37:5a52/128",
|
||||
"Cap": "tailscale.com/cap/drive-sharer",
|
||||
"Values": null
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
@ -665,8 +770,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",
|
||||
|
|
@ -676,8 +787,14 @@
|
|||
"ComputedName": "exit-node",
|
||||
"ComputedNameWithHost": "exit-node"
|
||||
},
|
||||
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
|
||||
"CapMap": { "tailscale.com/cap/drive-sharer": null }
|
||||
"UserProfile": {
|
||||
"ID": 1260082990019555,
|
||||
"LoginName": "tagged-devices",
|
||||
"DisplayName": "Tagged Devices"
|
||||
},
|
||||
"CapMap": {
|
||||
"tailscale.com/cap/drive-sharer": null
|
||||
}
|
||||
}
|
||||
},
|
||||
"100.92.142.61": {
|
||||
|
|
@ -723,7 +840,9 @@
|
|||
"CapGrant": [
|
||||
{
|
||||
"Dsts": ["100.90.199.68/32", "fd7a:115c:a1e0::2d01:c747/128"],
|
||||
"CapMap": { "tailscale.com/cap/drive-sharer": null }
|
||||
"CapMap": {
|
||||
"tailscale.com/cap/drive-sharer": null
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -735,8 +854,16 @@
|
|||
"SrcCaps": null,
|
||||
"Dsts": [],
|
||||
"Caps": [
|
||||
{ "Dst": "100.90.199.68/32", "Cap": "tailscale.com/cap/drive-sharer", "Values": null },
|
||||
{ "Dst": "fd7a:115c:a1e0::2d01:c747/128", "Cap": "tailscale.com/cap/drive-sharer", "Values": null }
|
||||
{
|
||||
"Dst": "100.90.199.68/32",
|
||||
"Cap": "tailscale.com/cap/drive-sharer",
|
||||
"Values": null
|
||||
},
|
||||
{
|
||||
"Dst": "fd7a:115c:a1e0::2d01:c747/128",
|
||||
"Cap": "tailscale.com/cap/drive-sharer",
|
||||
"Values": null
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
@ -766,8 +893,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",
|
||||
|
|
@ -777,8 +910,14 @@
|
|||
"ComputedName": "exit-node",
|
||||
"ComputedNameWithHost": "exit-node"
|
||||
},
|
||||
"UserProfile": { "ID": 1260082990019555, "LoginName": "tagged-devices", "DisplayName": "Tagged Devices" },
|
||||
"CapMap": { "tailscale.com/cap/drive-sharer": null }
|
||||
"UserProfile": {
|
||||
"ID": 1260082990019555,
|
||||
"LoginName": "tagged-devices",
|
||||
"DisplayName": "Tagged Devices"
|
||||
},
|
||||
"CapMap": {
|
||||
"tailscale.com/cap/drive-sharer": null
|
||||
}
|
||||
}
|
||||
},
|
||||
"100.92.142.61": {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue