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
|
|
@ -40,7 +40,15 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"grants_section": [{ "src": ["group:empty"], "dst": ["*"], "app": { "example.com/cap/test": [{}] } }],
|
||||
"grants_section": [
|
||||
{
|
||||
"src": ["group:empty"],
|
||||
"dst": ["*"],
|
||||
"app": {
|
||||
"example.com/cap/test": [{}]
|
||||
}
|
||||
}
|
||||
],
|
||||
"api_endpoint": "https://api.tailscale.com/api/v2/tailnet/kratail2tid%40passkey/acl",
|
||||
"api_method": "POST",
|
||||
"api_response_code": 200
|
||||
|
|
@ -63,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",
|
||||
|
|
@ -133,7 +143,9 @@
|
|||
"CapGrant": [
|
||||
{
|
||||
"Dsts": ["100.85.66.106/32", "fd7a:115c:a1e0::7c37:426a/128"],
|
||||
"CapMap": { "example.com/cap/test": [{}] }
|
||||
"CapMap": {
|
||||
"example.com/cap/test": [{}]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -145,8 +157,16 @@
|
|||
"SrcCaps": null,
|
||||
"Dsts": [],
|
||||
"Caps": [
|
||||
{ "Dst": "100.85.66.106/32", "Cap": "example.com/cap/test", "Values": [{}] },
|
||||
{ "Dst": "fd7a:115c:a1e0::7c37:426a/128", "Cap": "example.com/cap/test", "Values": [{}] }
|
||||
{
|
||||
"Dst": "100.85.66.106/32",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
},
|
||||
{
|
||||
"Dst": "fd7a:115c:a1e0::7c37:426a/128",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
@ -199,7 +219,9 @@
|
|||
"CapGrant": [
|
||||
{
|
||||
"Dsts": ["100.92.142.61/32", "fd7a:115c:a1e0::3e37:8e3d/128"],
|
||||
"CapMap": { "example.com/cap/test": [{}] }
|
||||
"CapMap": {
|
||||
"example.com/cap/test": [{}]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -211,8 +233,16 @@
|
|||
"SrcCaps": null,
|
||||
"Dsts": [],
|
||||
"Caps": [
|
||||
{ "Dst": "100.92.142.61/32", "Cap": "example.com/cap/test", "Values": [{}] },
|
||||
{ "Dst": "fd7a:115c:a1e0::3e37:8e3d/128", "Cap": "example.com/cap/test", "Values": [{}] }
|
||||
{
|
||||
"Dst": "100.92.142.61/32",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
},
|
||||
{
|
||||
"Dst": "fd7a:115c:a1e0::3e37:8e3d/128",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
@ -265,7 +295,9 @@
|
|||
"CapGrant": [
|
||||
{
|
||||
"Dsts": ["100.83.200.69/32", "fd7a:115c:a1e0::c537:c845/128"],
|
||||
"CapMap": { "example.com/cap/test": [{}] }
|
||||
"CapMap": {
|
||||
"example.com/cap/test": [{}]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -277,8 +309,16 @@
|
|||
"SrcCaps": null,
|
||||
"Dsts": [],
|
||||
"Caps": [
|
||||
{ "Dst": "100.83.200.69/32", "Cap": "example.com/cap/test", "Values": [{}] },
|
||||
{ "Dst": "fd7a:115c:a1e0::c537:c845/128", "Cap": "example.com/cap/test", "Values": [{}] }
|
||||
{
|
||||
"Dst": "100.83.200.69/32",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
},
|
||||
{
|
||||
"Dst": "fd7a:115c:a1e0::c537:c845/128",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
@ -329,7 +369,12 @@
|
|||
{
|
||||
"SrcIPs": [],
|
||||
"CapGrant": [
|
||||
{ "Dsts": ["100.103.8.15/32", "fd7a:115c:a1e0::5b37:80f/128"], "CapMap": { "example.com/cap/test": [{}] } }
|
||||
{
|
||||
"Dsts": ["100.103.8.15/32", "fd7a:115c:a1e0::5b37:80f/128"],
|
||||
"CapMap": {
|
||||
"example.com/cap/test": [{}]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
@ -340,8 +385,16 @@
|
|||
"SrcCaps": null,
|
||||
"Dsts": [],
|
||||
"Caps": [
|
||||
{ "Dst": "100.103.8.15/32", "Cap": "example.com/cap/test", "Values": [{}] },
|
||||
{ "Dst": "fd7a:115c:a1e0::5b37:80f/128", "Cap": "example.com/cap/test", "Values": [{}] }
|
||||
{
|
||||
"Dst": "100.103.8.15/32",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
},
|
||||
{
|
||||
"Dst": "fd7a:115c:a1e0::5b37:80f/128",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
@ -394,7 +447,9 @@
|
|||
"CapGrant": [
|
||||
{
|
||||
"Dsts": ["100.108.74.26/32", "fd7a:115c:a1e0::b901:4a87/128"],
|
||||
"CapMap": { "example.com/cap/test": [{}] }
|
||||
"CapMap": {
|
||||
"example.com/cap/test": [{}]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -406,8 +461,16 @@
|
|||
"SrcCaps": null,
|
||||
"Dsts": [],
|
||||
"Caps": [
|
||||
{ "Dst": "100.108.74.26/32", "Cap": "example.com/cap/test", "Values": [{}] },
|
||||
{ "Dst": "fd7a:115c:a1e0::b901:4a87/128", "Cap": "example.com/cap/test", "Values": [{}] }
|
||||
{
|
||||
"Dst": "100.108.74.26/32",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
},
|
||||
{
|
||||
"Dst": "fd7a:115c:a1e0::b901:4a87/128",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
@ -460,7 +523,9 @@
|
|||
"CapGrant": [
|
||||
{
|
||||
"Dsts": ["100.110.121.96/32", "fd7a:115c:a1e0::1737:7960/128"],
|
||||
"CapMap": { "example.com/cap/test": [{}] }
|
||||
"CapMap": {
|
||||
"example.com/cap/test": [{}]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -472,8 +537,16 @@
|
|||
"SrcCaps": null,
|
||||
"Dsts": [],
|
||||
"Caps": [
|
||||
{ "Dst": "100.110.121.96/32", "Cap": "example.com/cap/test", "Values": [{}] },
|
||||
{ "Dst": "fd7a:115c:a1e0::1737:7960/128", "Cap": "example.com/cap/test", "Values": [{}] }
|
||||
{
|
||||
"Dst": "100.110.121.96/32",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
},
|
||||
{
|
||||
"Dst": "fd7a:115c:a1e0::1737:7960/128",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
@ -526,7 +599,9 @@
|
|||
"CapGrant": [
|
||||
{
|
||||
"Dsts": ["100.103.90.82/32", "fd7a:115c:a1e0::9e37:5a52/128"],
|
||||
"CapMap": { "example.com/cap/test": [{}] }
|
||||
"CapMap": {
|
||||
"example.com/cap/test": [{}]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -538,8 +613,16 @@
|
|||
"SrcCaps": null,
|
||||
"Dsts": [],
|
||||
"Caps": [
|
||||
{ "Dst": "100.103.90.82/32", "Cap": "example.com/cap/test", "Values": [{}] },
|
||||
{ "Dst": "fd7a:115c:a1e0::9e37:5a52/128", "Cap": "example.com/cap/test", "Values": [{}] }
|
||||
{
|
||||
"Dst": "100.103.90.82/32",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
},
|
||||
{
|
||||
"Dst": "fd7a:115c:a1e0::9e37:5a52/128",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
@ -592,7 +675,9 @@
|
|||
"CapGrant": [
|
||||
{
|
||||
"Dsts": ["100.90.199.68/32", "fd7a:115c:a1e0::2d01:c747/128"],
|
||||
"CapMap": { "example.com/cap/test": [{}] }
|
||||
"CapMap": {
|
||||
"example.com/cap/test": [{}]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -604,8 +689,16 @@
|
|||
"SrcCaps": null,
|
||||
"Dsts": [],
|
||||
"Caps": [
|
||||
{ "Dst": "100.90.199.68/32", "Cap": "example.com/cap/test", "Values": [{}] },
|
||||
{ "Dst": "fd7a:115c:a1e0::2d01:c747/128", "Cap": "example.com/cap/test", "Values": [{}] }
|
||||
{
|
||||
"Dst": "100.90.199.68/32",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
},
|
||||
{
|
||||
"Dst": "fd7a:115c:a1e0::2d01:c747/128",
|
||||
"Cap": "example.com/cap/test",
|
||||
"Values": [{}]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue