* fix: reject query with block height in the future (#11222)
## Description
Closes: #11220
Should be good to backport to older versions.
---
### Author Checklist
*All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.*
I have...
- [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] added `!` to the type prefix if API or client breaking change
- [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting))
- [ ] provided a link to the relevant issue or specification
- [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules)
- [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing)
- [ ] added a changelog entry to `CHANGELOG.md`
- [ ] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [ ] updated the relevant documentation or specification
- [ ] reviewed "Files changed" and left comments if necessary
- [ ] confirmed all CI checks have passed
### Reviewers Checklist
*All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.*
I have...
- [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] confirmed `!` in the type prefix if API or client breaking change
- [ ] confirmed all author checklist items have been addressed
- [ ] reviewed state machine logic
- [ ] reviewed API design and naming
- [ ] reviewed documentation is accurate
- [ ] reviewed tests and test coverage
- [ ] manually tested (if applicable)
(cherry picked from commit 6324b5affb
)
# Conflicts:
# CHANGELOG.md
# baseapp/abci_test.go
* fix conflicts
Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
This commit is contained in:
parent
d69a7b6170
commit
12fffc1e21
|
@ -61,6 +61,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
|
|||
|
||||
* (grpc) [\#10985](https://github.com/cosmos/cosmos-sdk/pull/10992) The `/cosmos/tx/v1beta1/txs/{hash}` endpoint returns a 404 when a tx does not exist.
|
||||
* [\#10990](https://github.com/cosmos/cosmos-sdk/pull/10990) Fixes missing `iavl-cache-size` config parsing in `GetConfig` method.
|
||||
* [#11222](https://github.com/cosmos/cosmos-sdk/pull/11222) reject query with block height in the future
|
||||
|
||||
### Improvements
|
||||
|
||||
|
|
|
@ -622,9 +622,18 @@ func (app *BaseApp) createQueryContext(height int64, prove bool) (sdk.Context, e
|
|||
return sdk.Context{}, err
|
||||
}
|
||||
|
||||
lastBlockHeight := app.LastBlockHeight()
|
||||
if height > lastBlockHeight {
|
||||
return sdk.Context{},
|
||||
sdkerrors.Wrap(
|
||||
sdkerrors.ErrInvalidHeight,
|
||||
"cannot query with height in the future; please provide a valid height",
|
||||
)
|
||||
}
|
||||
|
||||
// when a client did not provide a query height, manually inject the latest
|
||||
if height == 0 {
|
||||
height = app.LastBlockHeight()
|
||||
height = lastBlockHeight
|
||||
}
|
||||
|
||||
if height <= 1 && prove {
|
||||
|
@ -640,7 +649,7 @@ func (app *BaseApp) createQueryContext(height int64, prove bool) (sdk.Context, e
|
|||
return sdk.Context{},
|
||||
sdkerrors.Wrapf(
|
||||
sdkerrors.ErrInvalidRequest,
|
||||
"failed to load state at height %d; %s (latest height: %d)", height, err, app.LastBlockHeight(),
|
||||
"failed to load state at height %d; %s (latest height: %d)", height, err, lastBlockHeight,
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package baseapp
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
abci "github.com/tendermint/tendermint/abci/types"
|
||||
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
|
||||
tmprototypes "github.com/tendermint/tendermint/proto/tendermint/types"
|
||||
dbm "github.com/tendermint/tm-db"
|
||||
|
||||
|
@ -118,9 +118,11 @@ func TestGetBlockRentionHeight(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
// Test and ensure that negative heights always cause errors.
|
||||
// See issue https://github.com/cosmos/cosmos-sdk/issues/7662.
|
||||
func TestBaseAppCreateQueryContextRejectsNegativeHeights(t *testing.T) {
|
||||
// Test and ensure that invalid block heights always cause errors.
|
||||
// See issues:
|
||||
// - https://github.com/cosmos/cosmos-sdk/issues/11220
|
||||
// - https://github.com/cosmos/cosmos-sdk/issues/7662
|
||||
func TestBaseAppCreateQueryContext(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
logger := defaultLogger()
|
||||
|
@ -128,14 +130,32 @@ func TestBaseAppCreateQueryContextRejectsNegativeHeights(t *testing.T) {
|
|||
name := t.Name()
|
||||
app := NewBaseApp(name, logger, db, nil)
|
||||
|
||||
proves := []bool{
|
||||
false, true,
|
||||
app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: 1}})
|
||||
app.Commit()
|
||||
|
||||
app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: 2}})
|
||||
app.Commit()
|
||||
|
||||
testCases := []struct {
|
||||
name string
|
||||
height int64
|
||||
prove bool
|
||||
expErr bool
|
||||
}{
|
||||
{"valid height", 2, true, false},
|
||||
{"future height", 10, true, true},
|
||||
{"negative height, prove=true", -1, true, true},
|
||||
{"negative height, prove=false", -1, false, true},
|
||||
}
|
||||
for _, prove := range proves {
|
||||
t.Run(fmt.Sprintf("prove=%t", prove), func(t *testing.T) {
|
||||
sctx, err := app.createQueryContext(-10, true)
|
||||
require.Error(t, err)
|
||||
require.Equal(t, sctx, sdk.Context{})
|
||||
|
||||
for _, tc := range testCases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
_, err := app.createQueryContext(tc.height, tc.prove)
|
||||
if tc.expErr {
|
||||
require.Error(t, err)
|
||||
} else {
|
||||
require.NoError(t, err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue