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

cmd/tailscale, ipn: WIP XXX: show ACL tags in tailscale status

Browse Source 
DO NOT SUBMIT; server doesn't send tags back anywhere

Updates #576

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2020-12-15 19:28:24 -08:00
parent da1bad51cd
commit 1ad82db95a
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipn/ipnstate/ipnstate.go
View File

@ -70,6 +70,11 @@ type PeerStatus struct {
// etc by default. // etc by default.
ShareeNode bool `json:",omitempty"` ShareeNode bool `json:",omitempty"`
// ACLTags, if non-empty, are the ACL identity the node is running as.
// When present, the UserID is then just who created it, but doesn't represent
// the effective user for ACL purposes.
ACLTags []string `json:",omitempty"`
// InNetworkMap means that this peer was seen in our latest network map. // InNetworkMap means that this peer was seen in our latest network map.
// In theory, all of InNetworkMap and InMagicSock and InEngine should all be true. // In theory, all of InNetworkMap and InMagicSock and InEngine should all be true.
InNetworkMap bool InNetworkMap bool
@ -170,6 +175,9 @@ func (sb *StatusBuilder) AddPeer(peer key.Public, st *PeerStatus) {
return return
} }
if len(st.ACLTags) != 0 {
e.ACLTags = st.ACLTags
}
if v := st.HostName; v != "" { if v := st.HostName; v != "" {
e.HostName = v e.HostName = v
} }

1
ipn/local.go
View File

@ -223,6 +223,7 @@ func (b *LocalBackend) UpdateStatus(sb *ipnstate.StatusBuilder) {
Created: p.Created, Created: p.Created,
LastSeen: lastSeen, LastSeen: lastSeen,
ShareeNode: p.Hostinfo.ShareeNode, ShareeNode: p.Hostinfo.ShareeNode,
ACLTags: p.Hostinfo.RequestTags,
}) })
} }
} }