Skip to content

Commit

Permalink
imp: deny selected client types from VerifyMembership rpc (#5871)
Browse files Browse the repository at this point in the history
* chore: add client status check to verify membership rpc

* imp: deny selected client types from VerifyMembership rpc
  • Loading branch information
damiannolan authored Feb 20, 2024
1 parent 94a4597 commit 4f14cfd
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 0 deletions.
11 changes: 11 additions & 0 deletions modules/core/02-client/keeper/grpc_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"context"
"fmt"
"slices"
"sort"
"strings"

Expand Down Expand Up @@ -341,6 +342,16 @@ func (k Keeper) VerifyMembership(c context.Context, req *types.QueryVerifyMember
return nil, status.Error(codes.InvalidArgument, err.Error())
}

clientType, _, err := types.ParseClientIdentifier(req.ClientId)
if err != nil {
return nil, status.Error(codes.InvalidArgument, err.Error())
}

denyClients := []string{exported.Localhost, exported.Solomachine}
if slices.Contains(denyClients, clientType) {
return nil, status.Error(codes.InvalidArgument, errorsmod.Wrapf(types.ErrInvalidClientType, "verify membership is disabled for client types %s", denyClients).Error())
}

if len(req.Proof) == 0 {
return nil, status.Error(codes.InvalidArgument, "empty proof")
}
Expand Down
18 changes: 18 additions & 0 deletions modules/core/02-client/keeper/grpc_query_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,24 @@ func (suite *KeeperTestSuite) TestQueryVerifyMembershipProof() {
},
host.ErrInvalidID,
},
{
"localhost client ID is denied",
func() {
req = &types.QueryVerifyMembershipRequest{
ClientId: exported.LocalhostClientID,
}
},
types.ErrInvalidClientType,
},
{
"solomachine client ID is denied",
func() {
req = &types.QueryVerifyMembershipRequest{
ClientId: types.FormatClientIdentifier(exported.Solomachine, 1),
}
},
types.ErrInvalidClientType,
},
{
"empty proof",
func() {
Expand Down

0 comments on commit 4f14cfd

Please sign in to comment.