TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

appc,ipn/local: support wildcard when matching app-connectors

Browse Source 
Updates: ENG-2453
Signed-off-by: Tom DNetto <tom@tailscale.com>
This commit is contained in:
Tom DNetto 2023-11-22 14:12:50 -08:00 committed by Tom
parent 1af7f5b549
commit 611e0a5bcc
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ipn/ipnlocal/local.go
View File

@ -3313,17 +3313,19 @@ func (b *LocalBackend) reconfigAppConnectorLocked(nm *netmap.NetworkMap, prefs i
return return
} }
var domains []string
for _, attr := range attrs {
// Geometric cost, assumes that the number of advertised tags is small // Geometric cost, assumes that the number of advertised tags is small
if !nm.SelfNode.Tags().ContainsFunc(func(tag string) bool { selfHasTag := func(attrTags []string) bool {
return slices.Contains(attr.Connectors, tag) return nm.SelfNode.Tags().ContainsFunc(func(tag string) bool {
}) { return slices.Contains(attrTags, tag)
continue })
} }
var domains []string
for _, attr := range attrs {
if slices.Contains(attr.Connectors, "*") || selfHasTag(attr.Connectors) {
domains = append(domains, attr.Domains...) domains = append(domains, attr.Domains...)
} }
}
slices.Sort(domains) slices.Sort(domains)
slices.Compact(domains) slices.Compact(domains)
b.appConnector.UpdateDomains(domains) b.appConnector.UpdateDomains(domains)

3
types/appctype/appconnector.go
View File

@ -67,6 +67,7 @@ type AppConnectorAttr struct {
// Domains can be of the form: example.com, or *.example.com. // Domains can be of the form: example.com, or *.example.com.
Domains []string `json:"domains,omitempty"` Domains []string `json:"domains,omitempty"`
// Connectors enumerates the app connectors which service these domains. // Connectors enumerates the app connectors which service these domains.
// These can be any target type supported by Tailscale's ACL language. // These can either be "*" to match any advertising connector, or a
// tag of the form tag:<tag-name>.
Connectors []string `json:"connectors,omitempty"` Connectors []string `json:"connectors,omitempty"`
} }