From 53b8c5c06b1d169f3155971ed50ca239cff4b5f4 Mon Sep 17 00:00:00 2001 From: Josh Hawn Date: Thu, 17 May 2018 16:34:21 -0700 Subject: [PATCH] Copy response to client on failed handshake Docker-DCO-1.1-Signed-off-by: Josh Hawn (github: jlhawn) --- websocketproxy.go | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/websocketproxy.go b/websocketproxy.go index 88d17e1..29f5bda 100644 --- a/websocketproxy.go +++ b/websocketproxy.go @@ -3,6 +3,7 @@ package websocketproxy import ( "fmt" + "io" "log" "net" "net/http" @@ -133,7 +134,17 @@ func (w *WebsocketProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) { // http://tools.ietf.org/html/draft-ietf-hybi-websocket-multiplexing-01 connBackend, resp, err := dialer.Dial(backendURL.String(), requestHeader) if err != nil { - log.Printf("websocketproxy: couldn't dial to remote backend url %s\n", err) + log.Printf("websocketproxy: couldn't dial to remote backend url %s", err) + if resp != nil { + // If the WebSocket handshake fails, ErrBadHandshake is returned + // along with a non-nil *http.Response so that callers can handle + // redirects, authentication, etcetera. + if err := copyResponse(rw, resp); err != nil { + log.Printf("websocketproxy: couldn't write response after failed remote backend handshake: %s", err) + } + } else { + http.Error(rw, http.StatusText(http.StatusServiceUnavailable), http.StatusServiceUnavailable) + } return } defer connBackend.Close() @@ -156,7 +167,7 @@ func (w *WebsocketProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) { // Also pass the header that we gathered from the Dial handshake. connPub, err := upgrader.Upgrade(rw, req, upgradeHeader) if err != nil { - log.Printf("websocketproxy: couldn't upgrade %s\n", err) + log.Printf("websocketproxy: couldn't upgrade %s", err) return } defer connPub.Close() @@ -200,3 +211,20 @@ func (w *WebsocketProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) { log.Printf(message, err) } } + +func copyHeader(dst, src http.Header) { + for k, vv := range src { + for _, v := range vv { + dst.Add(k, v) + } + } +} + +func copyResponse(rw http.ResponseWriter, resp *http.Response) error { + copyHeader(rw.Header(), resp.Header) + rw.WriteHeader(resp.StatusCode) + defer resp.Body.Close() + + _, err := io.Copy(rw, resp.Body) + return err +}