forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rpc: don't set Origin header for empty (default) origin

Browse source
This commit is contained in:
Felix Lange 2019-07-19 16:32:45 +02:00
parent 61b12da21f
commit bbfe6f9c17
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rpc/websocket.go
View file

@ -141,7 +141,9 @@ func wsClientHeaders(endpoint, origin string) (string, http.Header, error) {
return endpoint, nil, err return endpoint, nil, err
} }
header := make(http.Header) header := make(http.Header)
header.Add("origin", origin) if origin != "" {
header.Add("origin", origin)
}
if endpointURL.User != nil { if endpointURL.User != nil {
b64auth := base64.StdEncoding.EncodeToString([]byte(endpointURL.User.String())) b64auth := base64.StdEncoding.EncodeToString([]byte(endpointURL.User.String()))
header.Add("authorization", "Basic "+b64auth) header.Add("authorization", "Basic "+b64auth)

6
rpc/websocket_test.go
View file

@ -66,6 +66,12 @@ func TestWebsocketOriginCheck(t *testing.T) {
if err != websocket.ErrBadHandshake { if err != websocket.ErrBadHandshake {
t.Fatalf("wrong error for wrong origin: %q", err) t.Fatalf("wrong error for wrong origin: %q", err)
} }
client, err = DialWebsocket(context.Background(), wsURL, "")
if err != nil {
t.Fatal("error for empty origin")
}
client.Close()
} }
// This test checks whether calls exceeding the request size limit are rejected. // This test checks whether calls exceeding the request size limit are rejected.