lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tailcfg,all: add and use Node.IsTagged() 

Signed-off-by: Maisem Ali <maisem@tailscale.com>
andrew/fastjson
Maisem Ali 2023-03-12 23:52:17 -07:00 committed by Maisem Ali
parent 83fa17d26c
commit 223713d4a1
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/nginx-auth/nginx-auth.go
View File

@ -56,7 +56,7 @@ func main() {
return return
} }
if len(info.Node.Tags) != 0 { if info.Node.IsTagged() {
w.WriteHeader(http.StatusForbidden) w.WriteHeader(http.StatusForbidden)
log.Printf("node %s is tagged", info.Node.Hostinfo.Hostname()) log.Printf("node %s is tagged", info.Node.Hostinfo.Hostname())
return return

2
cmd/proxy-to-grafana/proxy-to-grafana.go
View File

@ -147,7 +147,7 @@ func getTailscaleUser(ctx context.Context, localClient *tailscale.LocalClient, i
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to identify remote host: %w", err) return nil, fmt.Errorf("failed to identify remote host: %w", err)
} }
if len(whois.Node.Tags) != 0 { if whois.Node.IsTagged() {
return nil, fmt.Errorf("tagged nodes are not users") return nil, fmt.Errorf("tagged nodes are not users")
} }
if whois.UserProfile == nil || whois.UserProfile.LoginName == "" { if whois.UserProfile == nil || whois.UserProfile.LoginName == "" {

2
ssh/tailssh/incubator.go
View File

@ -102,7 +102,7 @@ func (ss *sshSession) newIncubatorCommand() (cmd *exec.Cmd) {
ci := ss.conn.info ci := ss.conn.info
gids := strings.Join(ss.conn.userGroupIDs, ",") gids := strings.Join(ss.conn.userGroupIDs, ",")
remoteUser := ci.uprof.LoginName remoteUser := ci.uprof.LoginName
if len(ci.node.Tags) > 0 { if ci.node.IsTagged() {
remoteUser = strings.Join(ci.node.Tags, ",") remoteUser = strings.Join(ci.node.Tags, ",")
} }

5
tailcfg/tailcfg.go
View File

@ -313,6 +313,11 @@ func (n *Node) DisplayNames(forOwner bool) (name, hostIfDifferent string) {
return n.ComputedName, "" return n.ComputedName, ""
} }
// IsTagged reports whether the node has any tags.
func (n *Node) IsTagged() bool {
return len(n.Tags) > 0
}
// InitDisplayNames computes and populates n's display name // InitDisplayNames computes and populates n's display name
// fields: n.ComputedName, n.computedHostIfDifferent, and // fields: n.ComputedName, n.computedHostIfDifferent, and
// n.ComputedNameWithHost. // n.ComputedNameWithHost.