Skip to content

Revert "patch proxyd validId" #547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
InoMurko merged 1 commit into from
Feb 1, 2023
Merged

Revert "patch proxyd validId" #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
208 changes: 104 additions & 104 deletions go/proxyd/integration_tests/validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,94 +13,94 @@ const (
notWhitelistedResponse = `{"jsonrpc":"2.0","error":{"code":-32001,"message":"rpc method is not whitelisted custom message"},"id":999}`
parseErrResponse = `{"jsonrpc":"2.0","error":{"code":-32700,"message":"parse error"},"id":null}`
invalidJSONRPCVersionResponse = `{"error":{"code":-32601,"message":"invalid JSON-RPC version"},"id":null,"jsonrpc":"2.0"}`
//invalidIDResponse = `{"error":{"code":-32601,"message":"invalid ID"},"id":null,"jsonrpc":"2.0"}`
invalidMethodResponse = `{"error":{"code":-32601,"message":"no method specified"},"id":null,"jsonrpc":"2.0"}`
invalidBatchLenResponse = `{"error":{"code":-32601,"message":"must specify at least one batch call"},"id":null,"jsonrpc":"2.0"}`
invalidIDResponse = `{"error":{"code":-32601,"message":"invalid ID"},"id":null,"jsonrpc":"2.0"}`
invalidMethodResponse = `{"error":{"code":-32601,"message":"no method specified"},"id":null,"jsonrpc":"2.0"}`
invalidBatchLenResponse = `{"error":{"code":-32601,"message":"must specify at least one batch call"},"id":null,"jsonrpc":"2.0"}`
)

// func TestSingleRPCValidation(t *testing.T) {
// goodBackend := NewMockBackend(BatchedResponseHandler(200, goodResponse))
// defer goodBackend.Close()
func TestSingleRPCValidation(t *testing.T) {
goodBackend := NewMockBackend(BatchedResponseHandler(200, goodResponse))
defer goodBackend.Close()

// require.NoError(t, os.Setenv("GOOD_BACKEND_RPC_URL", goodBackend.URL()))
require.NoError(t, os.Setenv("GOOD_BACKEND_RPC_URL", goodBackend.URL()))

// config := ReadConfig("whitelist")
// client := NewProxydClient("http://127.0.0.1:8545")
// shutdown, err := proxyd.Start(config)
// require.NoError(t, err)
// defer shutdown()
config := ReadConfig("whitelist")
client := NewProxydClient("http://127.0.0.1:8545")
shutdown, err := proxyd.Start(config)
require.NoError(t, err)
defer shutdown()

// tests := []struct {
// name string
// body string
// res string
// code int
// }{
// {
// "body not JSON",
// "this ain't an RPC call",
// parseErrResponse,
// 400,
// },
// {
// "body not RPC",
// "{\"not\": \"rpc\"}",
// invalidJSONRPCVersionResponse,
// 400,
// },
// // {
// // "body missing RPC ID",
// // "{\"jsonrpc\": \"2.0\", \"method\": \"subtract\", \"params\": [42, 23]}",
// // invalidIDResponse,
// // 400,
// // },
// {
// "body has array ID",
// "{\"jsonrpc\": \"2.0\", \"method\": \"subtract\", \"params\": [42, 23], \"id\": []}",
// invalidIDResponse,
// 400,
// },
// {
// "body has object ID",
// "{\"jsonrpc\": \"2.0\", \"method\": \"subtract\", \"params\": [42, 23], \"id\": {}}",
// invalidIDResponse,
// 400,
// },
// {
// "bad method",
// "{\"jsonrpc\": \"2.0\", \"method\": 7, \"params\": [42, 23], \"id\": 1}",
// parseErrResponse,
// 400,
// },
// {
// "bad JSON-RPC",
// "{\"jsonrpc\": \"1.0\", \"method\": \"subtract\", \"params\": [42, 23], \"id\": 1}",
// invalidJSONRPCVersionResponse,
// 400,
// },
// {
// "omitted method",
// "{\"jsonrpc\": \"2.0\", \"params\": [42, 23], \"id\": 1}",
// invalidMethodResponse,
// 400,
// },
// {
// "not whitelisted method",
// "{\"jsonrpc\": \"2.0\", \"method\": \"subtract\", \"params\": [42, 23], \"id\": 999}",
// notWhitelistedResponse,
// 403,
// },
// }
// for _, tt := range tests {
// t.Run(tt.name, func(t *testing.T) {
// res, code, err := client.SendRequest([]byte(tt.body))
// require.NoError(t, err)
// RequireEqualJSON(t, []byte(tt.res), res)
// require.Equal(t, tt.code, code)
// require.Equal(t, 0, len(goodBackend.Requests()))
// })
// }
// }
tests := []struct {
name string
body string
res string
code int
}{
{
"body not JSON",
"this ain't an RPC call",
parseErrResponse,
400,
},
{
"body not RPC",
"{\"not\": \"rpc\"}",
invalidJSONRPCVersionResponse,
400,
},
{
"body missing RPC ID",
"{\"jsonrpc\": \"2.0\", \"method\": \"subtract\", \"params\": [42, 23]}",
invalidIDResponse,
400,
},
{
"body has array ID",
"{\"jsonrpc\": \"2.0\", \"method\": \"subtract\", \"params\": [42, 23], \"id\": []}",
invalidIDResponse,
400,
},
{
"body has object ID",
"{\"jsonrpc\": \"2.0\", \"method\": \"subtract\", \"params\": [42, 23], \"id\": {}}",
invalidIDResponse,
400,
},
{
"bad method",
"{\"jsonrpc\": \"2.0\", \"method\": 7, \"params\": [42, 23], \"id\": 1}",
parseErrResponse,
400,
},
{
"bad JSON-RPC",
"{\"jsonrpc\": \"1.0\", \"method\": \"subtract\", \"params\": [42, 23], \"id\": 1}",
invalidJSONRPCVersionResponse,
400,
},
{
"omitted method",
"{\"jsonrpc\": \"2.0\", \"params\": [42, 23], \"id\": 1}",
invalidMethodResponse,
400,
},
{
"not whitelisted method",
"{\"jsonrpc\": \"2.0\", \"method\": \"subtract\", \"params\": [42, 23], \"id\": 999}",
notWhitelistedResponse,
403,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
res, code, err := client.SendRequest([]byte(tt.body))
require.NoError(t, err)
RequireEqualJSON(t, []byte(tt.res), res)
require.Equal(t, tt.code, code)
require.Equal(t, 0, len(goodBackend.Requests()))
})
}
}

func TestBatchRPCValidation(t *testing.T) {
goodBackend := NewMockBackend(BatchedResponseHandler(200, goodResponse))
Expand Down Expand Up @@ -149,27 +149,27 @@ func TestBatchRPCValidation(t *testing.T) {
200,
0,
},
// {
// "body missing RPC ID",
// "[{\"jsonrpc\": \"2.0\", \"method\": \"subtract\", \"params\": [42, 23]}]",
// asArray(invalidIDResponse),
// 200,
// 0,
// },
// {
// "body has array ID",
// "[{\"jsonrpc\": \"2.0\", \"method\": \"subtract\", \"params\": [42, 23], \"id\": []}]",
// asArray(invalidIDResponse),
// 200,
// 0,
// },
// {
// "body has object ID",
// "[{\"jsonrpc\": \"2.0\", \"method\": \"subtract\", \"params\": [42, 23], \"id\": {}}]",
// asArray(invalidIDResponse),
// 200,
// 0,
// },
{
"body missing RPC ID",
"[{\"jsonrpc\": \"2.0\", \"method\": \"subtract\", \"params\": [42, 23]}]",
asArray(invalidIDResponse),
200,
0,
},
{
"body has array ID",
"[{\"jsonrpc\": \"2.0\", \"method\": \"subtract\", \"params\": [42, 23], \"id\": []}]",
asArray(invalidIDResponse),
200,
0,
},
{
"body has object ID",
"[{\"jsonrpc\": \"2.0\", \"method\": \"subtract\", \"params\": [42, 23], \"id\": {}}]",
asArray(invalidIDResponse),
200,
0,
},
// this happens because we can't deserialize the method into a non
// string value, and it blows up the parsing for the whole request.
{
Expand Down
7 changes: 3 additions & 4 deletions go/proxyd/rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,9 @@ func ValidateRPCReq(req *RPCReq) error {
return ErrInvalidRequest("no method specified")
}

// cosmic universe
// if !IsValidID(req.ID) {
// return ErrInvalidRequest("invalid ID")
// }
if !IsValidID(req.ID) {
return ErrInvalidRequest("invalid ID")
}

return nil
}
Expand Down