TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-27 10:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

serve: fix hostname for custom http ports

Browse Source 
When using a custom http port like 8080, this was resulting in a
constructed hostname of `host.tailnet.ts.net:8080.tailnet.ts.net` when
looking up the serve handler. Instead, strip off the port before adding
the MagicDNS suffix.

Also use the actual hostname in `serve status` rather than the literal
string "host".

Fixes #8635

Signed-off-by: Will Norris <will@tailscale.com>
This commit is contained in:
Will Norris 2023-07-17 16:50:58 -07:00 committed by Will Norris
parent c19b5bfbc3
commit f8b0caa8c2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/tailscale/cli/serve.go
View File

@ -699,7 +699,7 @@ func (e *serveEnv) printWebStatusTree(sc *ipn.ServeConfig, hp ipn.HostPort) erro
portPart = "" portPart = ""
} }
if scheme == "http" { if scheme == "http" {
hostname, _, _ := strings.Cut("host", ".") hostname, _, _ := strings.Cut(host, ".")
printf("%s://%s%s (%s)\n", scheme, hostname, portPart, fStatus) printf("%s://%s%s (%s)\n", scheme, hostname, portPart, fStatus)
} }
printf("%s://%s%s (%s)\n", scheme, host, portPart, fStatus) printf("%s://%s%s (%s)\n", scheme, host, portPart, fStatus)

3
ipn/ipnlocal/serve.go
View File

@ -415,6 +415,9 @@ func (b *LocalBackend) getServeHandler(r *http.Request) (_ ipn.HTTPHandlerView,
hostname := r.Host hostname := r.Host
if r.TLS == nil { if r.TLS == nil {
tcd := "." + b.Status().CurrentTailnet.MagicDNSSuffix tcd := "." + b.Status().CurrentTailnet.MagicDNSSuffix
if host, _, err := net.SplitHostPort(hostname); err == nil {
hostname = host
}
if !strings.HasSuffix(hostname, tcd) { if !strings.HasSuffix(hostname, tcd) {
hostname += tcd hostname += tcd
} }