From 18e3458ac98b4126ac324c8056a0f2d826c6688a Mon Sep 17 00:00:00 2001 From: Daved Date: Sun, 7 Apr 2019 13:13:06 -0700 Subject: [PATCH] cmd/present: fix origin mismatch for websocket when using HTTPS Fixes golang/go#31328 Change-Id: Ib190f42970d5b203e3f1fbf997aa896cf624bf91 Reviewed-on: https://go-review.googlesource.com/c/tools/+/171118 Reviewed-by: Brad Fitzpatrick Run-TryBot: Brad Fitzpatrick --- cmd/present/main.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/present/main.go b/cmd/present/main.go index 1fb7fa1eac..cc04c46408 100644 --- a/cmd/present/main.go +++ b/cmd/present/main.go @@ -77,6 +77,11 @@ func main() { origin := &url.URL{Scheme: "http"} if *originHost != "" { + if strings.HasPrefix(*originHost, "https://") { + *originHost = strings.TrimPrefix(*originHost, "https://") + origin.Scheme = "https" + } + *originHost = strings.TrimPrefix(*originHost, "http://") origin.Host = net.JoinHostPort(*originHost, port) } else if ln.Addr().(*net.TCPAddr).IP.IsUnspecified() { name, _ := os.Hostname()