BaseApp Security Improvements

baseapp/baseapp.go

@@ -287,12 +287,19 @@ func (app *BaseApp) storeConsensusParams(consensusParams *abci.ConsensusParams)
  mainStore.Set(mainConsensusParamsKey, consensusParamsBz)
 }
 
-// getMaximumBlockGas gets the maximum gas from the consensus params.
-func (app *BaseApp) getMaximumBlockGas() (maxGas uint64) {
+// getMaximumBlockGas gets the maximum gas from the consensus params. It panics
+// when the maximum block gas is non-positive.
+func (app *BaseApp) getMaximumBlockGas() uint64 {
  if app.consensusParams == nil || app.consensusParams.BlockSize == nil {
  return 0
  }
- return uint64(app.consensusParams.BlockSize.MaxGas)
+
+ maxGas := app.consensusParams.BlockSize.MaxGas
+ if maxGas < 0 {
+ panic(fmt.Sprintf("invalid block maximum gas: %d", maxGas))
+ }
+
+ return uint64(maxGas)
 }
 
 // ----------------------------------------------------------------------------

baseapp/baseapp_test.go

@@ -1216,3 +1216,16 @@ func TestP2PQuery(t *testing.T) {
  res = app.Query(idQuery)
  require.Equal(t, uint32(4), res.Code)
 }
+
+func TestGetMaximumBlockGas(t *testing.T) {
+ app := setupBaseApp(t)
+
+ app.setConsensusParams(&abci.ConsensusParams{BlockSize: &abci.BlockSizeParams{MaxGas: 0}})
+ require.Equal(t, uint64(0), app.getMaximumBlockGas())
+
+ app.setConsensusParams(&abci.ConsensusParams{BlockSize: &abci.BlockSizeParams{MaxGas: 5000000}})
+ require.Equal(t, uint64(5000000), app.getMaximumBlockGas())
+
+ app.setConsensusParams(&abci.ConsensusParams{BlockSize: &abci.BlockSizeParams{MaxGas: -5000000}})
+ require.Panics(t, func() {app.getMaximumBlockGas()})
+}