TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-03-25 18:51:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/hello: chop DNS name at first dot

Browse Source
This commit is contained in:
Brad Fitzpatrick 2021-02-11 16:38:26 -08:00
parent 6075135e0a
commit 5378776043
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/hello/hello.go
View File

@ -131,7 +131,7 @@ func root(w http.ResponseWriter, r *http.Request) {
DisplayName: who.UserProfile.DisplayName, DisplayName: who.UserProfile.DisplayName,
LoginName: who.UserProfile.LoginName, LoginName: who.UserProfile.LoginName,
ProfilePicURL: who.UserProfile.ProfilePicURL, ProfilePicURL: who.UserProfile.ProfilePicURL,
MachineName: who.Node.ComputedName, MachineName: firstLabel(who.Node.ComputedName),
MachineOS: who.Node.Hostinfo.OS, MachineOS: who.Node.Hostinfo.OS,
IP: ip, IP: ip,
} }
@ -140,6 +140,14 @@ func root(w http.ResponseWriter, r *http.Request) {
tmpl.Execute(w, data) tmpl.Execute(w, data)
} }
// firstLabel s up until the first period, if any.
func firstLabel(s string) string {
if i := strings.Index(s, "."); i != -1 {
return s[:i]
}
return s
}
// tsSockClient does HTTP requests to the local Tailscale daemon. // tsSockClient does HTTP requests to the local Tailscale daemon.
// The hostname in the HTTP request is ignored. // The hostname in the HTTP request is ignored.
var tsSockClient = &http.Client{ var tsSockClient = &http.Client{