Revert "Merge remote-tracking branch 'origin/master' into ws_jwt_client"

This reverts commit c3e683a, reversing
changes made to 01cc043.

JWT support was added upstream, we'll use it instead.

node/rpcstack_test.go

@@ -18,7 +18,6 @@ package node
 
 import (
 	"bytes"
-	"context"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -418,21 +417,5 @@ func TestJWT(t *testing.T) {
 			t.Errorf("tc %d-http, token '%v': expected not to allow,  got %v", i, token, resp.StatusCode)
 		}
 	}
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	client, err := rpc.DialWebsocketJWT(ctx, wsUrl, "orig", []byte("secret"))
-	if err != nil {
-		t.Errorf("DialWebsocketJWT should have succeeded, got %v", err)
-	}
-	if client != nil {
-		client.Close()
-	}
-	client, err = rpc.DialWebsocketJWT(ctx, wsUrl, "orig", []byte("bad"))
-	if err == nil {
-		t.Error("DialWebsocketJWT with bad secret should have failed")
-	}
-	if client != nil {
-		client.Close()
-	}
 	srv.stop()
 }

rpc/websocket.go

@@ -29,7 +29,6 @@ import (
 
 	mapset "github.com/deckarep/golang-set"
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/golang-jwt/jwt/v4"
 	"github.com/gorilla/websocket"
 )
 
@@ -185,17 +184,10 @@ func parseOriginURL(origin string) (string, string, string, error) {
 // DialWebsocketWithDialer creates a new RPC client that communicates with a JSON-RPC server
 // that is listening on the given endpoint using the provided dialer.
 func DialWebsocketWithDialer(ctx context.Context, endpoint, origin string, dialer websocket.Dialer) (*Client, error) {
-	return DialWebsocketWithDialerAndExtraHeaders(ctx, endpoint, origin, dialer, nil)
-}
-
-func DialWebsocketWithDialerAndExtraHeaders(ctx context.Context, endpoint, origin string, dialer websocket.Dialer, headers http.Header) (*Client, error) {
 	endpoint, header, err := wsClientHeaders(endpoint, origin)
 	if err != nil {
 		return nil, err
 	}
-	for headerType, content := range headers {
-		header[headerType] = append(header[headerType], content...)
-	}
 	return newClient(ctx, func(ctx context.Context) (ServerCodec, error) {
 		conn, resp, err := dialer.DialContext(ctx, endpoint, header)
 		if err != nil {
@@ -223,24 +215,6 @@ func DialWebsocket(ctx context.Context, endpoint, origin string) (*Client, error
 	return DialWebsocketWithDialer(ctx, endpoint, origin, dialer)
 }
 
-func DialWebsocketJWT(ctx context.Context, endpoint, origin string, jwtSecret []byte) (*Client, error) {
-	dialer := websocket.Dialer{
-		ReadBufferSize:  wsReadBuffer,
-		WriteBufferSize: wsWriteBuffer,
-		WriteBufferPool: wsBufferPool,
-	}
-	claims := jwt.StandardClaims{
-		IssuedAt: time.Now().Unix(),
-	}
-	jwtToken, err := jwt.NewWithClaims(jwt.SigningMethodHS256, claims).SignedString(jwtSecret)
-	if err != nil {
-		return nil, err
-	}
-	extraHeaders := http.Header(make(map[string][]string))
-	extraHeaders["Authorization"] = []string{fmt.Sprintf("Bearer %s", jwtToken)}
-	return DialWebsocketWithDialerAndExtraHeaders(ctx, endpoint, origin, dialer, extraHeaders)
-}
-
 func wsClientHeaders(endpoint, origin string) (string, http.Header, error) {
 	endpointURL, err := url.Parse(endpoint)
 	if err != nil {