Skip to content
This repository has been archived by the owner on Feb 15, 2019. It is now read-only.

Disable websocket compression #51

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions forward/fwd.go
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,6 @@ func (f *httpForwarder) serveWebSocket(w http.ResponseWriter, req *http.Request,

dialer := websocket.DefaultDialer

dialer.EnableCompression = strings.Contains(req.Header.Get("Sec-Websocket-Extensions"), "permessage-deflate")

if outReq.URL.Scheme == "wss" && f.tlsClientConfig != nil {
dialer.TLSClientConfig = f.tlsClientConfig.Clone()
// WebSocket is only in http/1.1
Expand Down Expand Up @@ -326,8 +324,6 @@ func (f *httpForwarder) serveWebSocket(w http.ResponseWriter, req *http.Request,
return true
}}

upgrader.EnableCompression = strings.Contains(resp.Header.Get("Sec-Websocket-Extensions"), "permessage-deflate")

utils.RemoveHeaders(resp.Header, WebsocketUpgradeHeaders...)

underlyingConn, err := upgrader.Upgrade(w, req, resp.Header)
Expand Down
103 changes: 0 additions & 103 deletions forward/fwd_websocket_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"net"
"net/http"
"net/http/httptest"
"strings"
"time"

gorillawebsocket "github.com/gorilla/websocket"
Expand Down Expand Up @@ -52,108 +51,6 @@ func (s *FwdSuite) TestWebSocketEcho(c *C) {

}

func (s *FwdSuite) TestWebSocketWithCompress(c *C) {
f, err := New()
c.Assert(err, IsNil)

upgrader := gorillawebsocket.Upgrader{CheckOrigin: func(r *http.Request) bool {
return true
}}
upgrader.EnableCompression = true
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
c, err := upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
defer c.Close()
for {
mt, message, err := c.ReadMessage()
if err != nil {
break
}
err = c.WriteMessage(mt, message)
if err != nil {
break
}
}
}))
defer srv.Close()

proxy := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
req.URL = testutils.ParseURI(srv.URL)
f.ServeHTTP(w, req)
})
serverAddr := proxy.Listener.Addr().String()
c.Log(serverAddr)
headers := http.Header{}
webSocketURL := "ws://" + serverAddr + "/ws"
headers.Add("Origin", webSocketURL)
dialer := gorillawebsocket.DefaultDialer
dialer.EnableCompression = true
conn, resp, err := dialer.Dial(webSocketURL, headers)
if err != nil {
c.Errorf("Error [%s] during Dial with response: %+v", err, resp)
return
}
conn.WriteMessage(gorillawebsocket.TextMessage, []byte("OK"))
c.Log(conn.ReadMessage())

isCompress := strings.Contains(resp.Header.Get("Sec-Websocket-Extensions"), "permessage-deflate")

c.Assert(isCompress, Equals, true)
}

func (s *FwdSuite) TestWebSocketWithNoCompressOnServer(c *C) {
f, err := New()
c.Assert(err, IsNil)

upgrader := gorillawebsocket.Upgrader{CheckOrigin: func(r *http.Request) bool {
return true
}}
upgrader.EnableCompression = false
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
c, err := upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
defer c.Close()
for {
mt, message, err := c.ReadMessage()
if err != nil {
break
}
err = c.WriteMessage(mt, message)
if err != nil {
break
}
}
}))
defer srv.Close()

proxy := testutils.NewHandler(func(w http.ResponseWriter, req *http.Request) {
req.URL = testutils.ParseURI(srv.URL)
f.ServeHTTP(w, req)
})
serverAddr := proxy.Listener.Addr().String()
c.Log(serverAddr)
headers := http.Header{}
webSocketURL := "ws://" + serverAddr + "/ws"
headers.Add("Origin", webSocketURL)
dialer := gorillawebsocket.DefaultDialer
dialer.EnableCompression = true
conn, resp, err := dialer.Dial(webSocketURL, headers)
if err != nil {
c.Errorf("Error [%s] during Dial with response: %+v", err, resp)
return
}
conn.WriteMessage(gorillawebsocket.TextMessage, []byte("OK"))
c.Log(conn.ReadMessage())

isCompress := strings.Contains(resp.Header.Get("Sec-Websocket-Extensions"), "permessage-deflate")

c.Assert(isCompress, Equals, false)
}

func (s *FwdSuite) TestWebSocketServerWithoutCheckOrigin(c *C) {
f, err := New()
c.Assert(err, IsNil)
Expand Down