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 <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/cmd/present/main.go b/cmd/present/main.go
index 1fb7fa1..cc04c46 100644
--- a/cmd/present/main.go
+++ b/cmd/present/main.go
@@ -77,6 +77,11 @@
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()