mirrors/tailscale
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

dnsname,tailcfg: add hostname sanitation logic to node display names (#1304)

Browse Source 
Signed-off-by: Sonia Appasamy <sonia@tailscale.com>
This commit is contained in:
Sonia Appasamy
2021-02-18 17:15:38 -05:00
committed by GitHub
parent c386496e4f
commit 76fb27bea7
5 changed files with 194 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/tailscale/cli/status.go
View File

@ -216,13 +216,11 @@ func peerActive(ps *ipnstate.PeerStatus) bool {
}
func dnsOrQuoteHostname(st *ipnstate.Status, ps *ipnstate.PeerStatus) string {
if i := strings.Index(ps.DNSName, "."); i != -1 && dnsname.HasSuffix(ps.DNSName, st.MagicDNSSuffix) {
return ps.DNSName[:i]
baseName := dnsname.TrimSuffix(ps.DNSName, st.MagicDNSSuffix)
if baseName != "" {
return baseName
}
if ps.DNSName != "" {
return strings.TrimRight(ps.DNSName, ".")
}
return fmt.Sprintf("(%q)", strings.ReplaceAll(ps.SimpleHostName(), " ", "_"))
return fmt.Sprintf("(%q)", dnsname.SanitizeHostname(ps.HostName))
}
func ownerLogin(st *ipnstate.Status, ps *ipnstate.PeerStatus) string {