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

control/controlclient: also log active account in netmaps

Browse Source 
Updates tailscale/corp#461
This commit is contained in:
Brad Fitzpatrick 2020-10-27 13:46:05 -07:00
parent 999bc93a4d
commit a3f17b8108
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
control/controlclient/netmap.go
View File

@ -75,6 +75,15 @@ func (nm *NetworkMap) Concise() string {
func (nm *NetworkMap) printConciseHeader(buf *strings.Builder) { func (nm *NetworkMap) printConciseHeader(buf *strings.Builder) {
fmt.Fprintf(buf, "netmap: self: %v auth=%v", fmt.Fprintf(buf, "netmap: self: %v auth=%v",
nm.NodeKey.ShortString(), nm.MachineStatus) nm.NodeKey.ShortString(), nm.MachineStatus)
login := nm.UserProfiles[nm.User].LoginName
if login == "" {
if nm.User.IsZero() {
login = "?"
} else {
login = fmt.Sprint(nm.User)
}
}
fmt.Fprintf(buf, " u=%s", login)
if nm.LocalPort != 0 { if nm.LocalPort != 0 {
fmt.Fprintf(buf, " port=%v", nm.LocalPort) fmt.Fprintf(buf, " port=%v", nm.LocalPort)
} }
@ -92,6 +101,7 @@ func (a *NetworkMap) equalConciseHeader(b *NetworkMap) bool {
if a.NodeKey != b.NodeKey || if a.NodeKey != b.NodeKey ||
a.MachineStatus != b.MachineStatus || a.MachineStatus != b.MachineStatus ||
a.LocalPort != b.LocalPort || a.LocalPort != b.LocalPort ||
a.User != b.User ||
len(a.Addresses) != len(b.Addresses) { len(a.Addresses) != len(b.Addresses) {
return false return false
} }

8
control/controlclient/netmap_test.go
View File

@ -51,7 +51,7 @@ func TestNetworkMapConcise(t *testing.T) {
}, },
}, },
}, },
want: "netmap: self: [AQEBA] auth=machine-unknown []\n [AgICA] D2 : 192.168.0.100:12 192.168.0.100:12354\n [AwMDA] D4 : 10.2.0.100:12 10.1.0.100:12345\n", want: "netmap: self: [AQEBA] auth=machine-unknown u=? []\n [AgICA] D2 : 192.168.0.100:12 192.168.0.100:12354\n [AwMDA] D4 : 10.2.0.100:12 10.1.0.100:12345\n",
}, },
{ {
name: "debug_non_nil", name: "debug_non_nil",
@ -59,7 +59,7 @@ func TestNetworkMapConcise(t *testing.T) {
NodeKey: testNodeKey(1), NodeKey: testNodeKey(1),
Debug: &tailcfg.Debug{}, Debug: &tailcfg.Debug{},
}, },
want: "netmap: self: [AQEBA] auth=machine-unknown debug={} []\n", want: "netmap: self: [AQEBA] auth=machine-unknown u=? debug={} []\n",
}, },
{ {
name: "debug_values", name: "debug_values",
@ -67,7 +67,7 @@ func TestNetworkMapConcise(t *testing.T) {
NodeKey: testNodeKey(1), NodeKey: testNodeKey(1),
Debug: &tailcfg.Debug{LogHeapPprof: true}, Debug: &tailcfg.Debug{LogHeapPprof: true},
}, },
want: "netmap: self: [AQEBA] auth=machine-unknown debug={\"LogHeapPprof\":true} []\n", want: "netmap: self: [AQEBA] auth=machine-unknown u=? debug={\"LogHeapPprof\":true} []\n",
}, },
} { } {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
@ -135,7 +135,7 @@ func TestConciseDiffFrom(t *testing.T) {
}, },
}, },
}, },
want: "-netmap: self: [AQEBA] auth=machine-unknown []\n+netmap: self: [AgICA] auth=machine-unknown []\n", want: "-netmap: self: [AQEBA] auth=machine-unknown u=? []\n+netmap: self: [AgICA] auth=machine-unknown u=? []\n",
}, },
{ {
name: "peer_add", name: "peer_add",