From aade27e0d7904d4be69d9d65857e908ec3849c66 Mon Sep 17 00:00:00 2001 From: will butler Date: Wed, 19 Dec 2018 13:24:06 -0800 Subject: [PATCH 1/2] Preserve host header --- websocketproxy.go | 3 +++ websocketproxy_test.go | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/websocketproxy.go b/websocketproxy.go index 29f5bda..7e4c7dc 100644 --- a/websocketproxy.go +++ b/websocketproxy.go @@ -97,6 +97,9 @@ func (w *WebsocketProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) { for _, cookie := range req.Header[http.CanonicalHeaderKey("Cookie")] { requestHeader.Add("Cookie", cookie) } + if host := req.Host; host != "" { + requestHeader.Set("Host", host) + } // Pass X-Forwarded-For headers too, code below is a part of // httputil.ReverseProxy. See http://en.wikipedia.org/wiki/X-Forwarded-For diff --git a/websocketproxy_test.go b/websocketproxy_test.go index 63f7861..defe389 100644 --- a/websocketproxy_test.go +++ b/websocketproxy_test.go @@ -45,6 +45,12 @@ func TestProxy(t *testing.T) { go func() { mux2 := http.NewServeMux() mux2.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + // Don't upgrade if original host header isnt preserved + if r.Host != "127.0.0.1:7777" { + log.Printf("Host header set incorrectly. Expecting 127.0.0.1:7777 got %s", r.Host) + return + } + conn, err := upgrader.Upgrade(w, r, nil) if err != nil { log.Println(err) From 1458be2d531f7caf3f7cffa19d810964143131a1 Mon Sep 17 00:00:00 2001 From: will butler Date: Thu, 20 Dec 2018 13:27:04 -0800 Subject: [PATCH 2/2] making requested PR changes --- websocketproxy.go | 4 ++-- websocketproxy_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/websocketproxy.go b/websocketproxy.go index 7e4c7dc..63d39ba 100644 --- a/websocketproxy.go +++ b/websocketproxy.go @@ -97,8 +97,8 @@ func (w *WebsocketProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) { for _, cookie := range req.Header[http.CanonicalHeaderKey("Cookie")] { requestHeader.Add("Cookie", cookie) } - if host := req.Host; host != "" { - requestHeader.Set("Host", host) + if req.Host != "" { + requestHeader.Set("Host", req.Host) } // Pass X-Forwarded-For headers too, code below is a part of diff --git a/websocketproxy_test.go b/websocketproxy_test.go index defe389..b90e02b 100644 --- a/websocketproxy_test.go +++ b/websocketproxy_test.go @@ -45,7 +45,7 @@ func TestProxy(t *testing.T) { go func() { mux2 := http.NewServeMux() mux2.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - // Don't upgrade if original host header isnt preserved + // Don't upgrade if original host header isn't preserved if r.Host != "127.0.0.1:7777" { log.Printf("Host header set incorrectly. Expecting 127.0.0.1:7777 got %s", r.Host) return