roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

node: relax websocket connection header check (#21646)

Browse Source 
This makes it accept the "upgrade,keep-alive" header value, which
apparently is a thing.
This commit is contained in:
Felix Lange 2020-10-07 20:05:14 +02:00 committed by GitHub
parent 716864deba
commit 015e78928a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/rpcstack.go
View File

@ -313,7 +313,7 @@ func (h *httpServer) wsAllowed() bool {
// isWebsocket checks the header of an http request for a websocket upgrade request. // isWebsocket checks the header of an http request for a websocket upgrade request.
func isWebsocket(r *http.Request) bool { func isWebsocket(r *http.Request) bool {
return strings.ToLower(r.Header.Get("Upgrade")) == "websocket" && return strings.ToLower(r.Header.Get("Upgrade")) == "websocket" &&
strings.ToLower(r.Header.Get("Connection")) == "upgrade" strings.Contains(strings.ToLower(r.Header.Get("Connection")), "upgrade")
} }
// NewHTTPHandlerStack returns wrapped http-related handlers // NewHTTPHandlerStack returns wrapped http-related handlers

15
node/rpcstack_test.go
View File

@ -73,6 +73,21 @@ func TestWebsocketOrigins(t *testing.T) {
assert.Error(t, err) assert.Error(t, err)
} }
// TestIsWebsocket tests if an incoming websocket upgrade request is handled properly.
func TestIsWebsocket(t *testing.T) {
r, _ := http.NewRequest("GET", "/", nil)
assert.False(t, isWebsocket(r))
r.Header.Set("upgrade", "websocket")
assert.False(t, isWebsocket(r))
r.Header.Set("connection", "upgrade")
assert.True(t, isWebsocket(r))
r.Header.Set("connection", "upgrade,keep-alive")
assert.True(t, isWebsocket(r))
r.Header.Set("connection", " UPGRADE,keep-alive")
assert.True(t, isWebsocket(r))
}
func createAndStartServer(t *testing.T, conf httpConfig, ws bool, wsConf wsConfig) *httpServer { func createAndStartServer(t *testing.T, conf httpConfig, ws bool, wsConf wsConfig) *httpServer {
t.Helper() t.Helper()