TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-27 02:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/k8s-operator: drop trailing dot in tagged node name

Browse Source 
Also update tailcfg docs.

Updates #5055

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2023-03-13 15:22:42 -07:00 committed by Maisem Ali
parent 09e0ccf4c2
commit c87782ba9d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/k8s-operator/proxy.go
View File

@ -88,7 +88,7 @@ func runAuthProxy(s *tsnet.Server, rt http.RoundTripper, logf logger.Logf) {
if who.Node.IsTagged() { if who.Node.IsTagged() {
// Use the nodes FQDN as the username, and the nodes tags as the groups. // Use the nodes FQDN as the username, and the nodes tags as the groups.
// "Impersonate-Group" requires "Impersonate-User" to be set. // "Impersonate-Group" requires "Impersonate-User" to be set.
r.Header.Set("Impersonate-User", who.Node.Name) r.Header.Set("Impersonate-User", strings.TrimSuffix(who.Node.Name, "."))
for _, tag := range who.Node.Tags { for _, tag := range who.Node.Tags {
r.Header.Add("Impersonate-Group", tag) r.Header.Add("Impersonate-Group", tag)
} }

7
tailcfg/tailcfg.go
View File

@ -183,7 +183,12 @@ func (emptyStructJSONSlice) UnmarshalJSON([]byte) error { return nil }
type Node struct { type Node struct {
ID NodeID ID NodeID
StableID StableNodeID StableID StableNodeID
Name string // DNS
// Name is the FQDN of the node.
// It is also the MagicDNS name for the node.
// It has a trailing dot.
// e.g. "host.tail-scale.ts.net."
Name string
// User is the user who created the node. If ACL tags are in // User is the user who created the node. If ACL tags are in
// use for the node then it doesn't reflect the ACL identity // use for the node then it doesn't reflect the ACL identity