Skip to content
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.

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

fix(claimsmanager): properly check index to avoid invalid data in UserClaims,UserLastEpochClaims #1234

Merged
Changes from all commits
Commits
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
25 changes: 19 additions & 6 deletions x/claimsmanager/keeper/grpc_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,17 @@ func (k Keeper) UserClaims(c context.Context, q *types.QueryClaimsRequest) (*typ
addrBytes := []byte(q.Address)

k.IterateAllClaims(ctx, func(_ int64, key []byte, claim types.Claim) (stop bool) {
// The assumption is that IterateAllClaims returns non-empty keys.
// check for the presence of the addr bytes in the key.
// first prefix byte is 0x00; so cater for that! Then + 1 to skip the separator.
idx := bytes.Index(key[1:], []byte{0x00}) + 1 + 1
if idx >= 0 && bytes.Equal(key[idx:idx+len(addrBytes)], addrBytes) {
// first prefix byte is 0x00; so cater for that!
idx := bytes.Index(key[1:], []byte{0x00})
if idx < 0 {
return false
}

idx += 1 + 1 // add + 1 to skip the separator.

if bytes.Equal(key[idx:idx+len(addrBytes)], addrBytes) {
out = append(out, claim)
}
return false
Expand All @@ -86,9 +93,15 @@ func (k Keeper) UserLastEpochClaims(c context.Context, q *types.QueryClaimsReque
addrBytes := []byte(q.Address)
k.IterateAllLastEpochClaims(ctx, func(_ int64, key []byte, claim types.Claim) (stop bool) {
// check for the presence of the addr bytes in the key.
// First byte is 0x01 here, so no need to consider it; + 1 to skip the separator.
idx := bytes.Index(key, []byte{0x00}) + 1
if idx >= 0 && bytes.Equal(key[idx:idx+len(addrBytes)], addrBytes) {
idx := bytes.Index(key, []byte{0x00})
if idx < 0 {
return false
}

// First byte was 0x01, so no need to consider it; + 1 to skip the separator.
idx += 1

if bytes.Equal(key[idx:idx+len(addrBytes)], addrBytes) {
out = append(out, claim)
}
return false
Expand Down