TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 11:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

client/web: fix panic on logout

Browse Source 
Fix panic due to `CurrentTailnet` being nil.

Fixes tailscale/corp#15791

Signed-off-by: Sonia Appasamy <sonia@tailscale.com>
This commit is contained in:
Sonia Appasamy 2023-11-14 14:14:18 -05:00 committed by Sonia Appasamy
parent 063657c65f
commit 7c99a1763b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/web/web.go
View File

@ -567,8 +567,6 @@ func (s *Server) serveGetNodeData(w http.ResponseWriter, r *http.Request) {
ID: st.Self.ID, ID: st.Self.ID,
Status: st.BackendState, Status: st.BackendState,
DeviceName: strings.Split(st.Self.DNSName, ".")[0], DeviceName: strings.Split(st.Self.DNSName, ".")[0],
TailnetName: st.CurrentTailnet.MagicDNSSuffix,
DomainName: st.CurrentTailnet.Name,
OS: st.Self.OS, OS: st.Self.OS,
IPNVersion: strings.Split(st.Version, "-")[0], IPNVersion: strings.Split(st.Version, "-")[0],
Profile: st.User[st.Self.UserID], Profile: st.User[st.Self.UserID],
@ -594,6 +592,10 @@ func (s *Server) serveGetNodeData(w http.ResponseWriter, r *http.Request) {
break break
} }
} }
if st.CurrentTailnet != nil {
data.TailnetName = st.CurrentTailnet.MagicDNSSuffix
data.DomainName = st.CurrentTailnet.Name
}
if st.Self.Tags != nil { if st.Self.Tags != nil {
data.Tags = st.Self.Tags.AsSlice() data.Tags = st.Self.Tags.AsSlice()
} }