From ae36523a612730ecbc2ea288dcb6e4674e35b13b Mon Sep 17 00:00:00 2001 From: Anna Shaleva Date: Mon, 19 Apr 2021 10:48:35 +0300 Subject: [PATCH] rpc, internal: fix CodeQL int conversions warnings ``` Incorrect conversion of an integer with architecture-dependent bit size from to a lower bit size type int32 without an upper bound check. ``` --- internal/fakechain/fakechain.go | 4 ++++ pkg/rpc/server/server.go | 9 +++++++++ pkg/rpc/server/util.go | 20 ++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 pkg/rpc/server/util.go diff --git a/internal/fakechain/fakechain.go b/internal/fakechain/fakechain.go index 587a51c5d..5268c4525 100644 --- a/internal/fakechain/fakechain.go +++ b/internal/fakechain/fakechain.go @@ -2,6 +2,7 @@ package fakechain import ( "errors" + "math" "math/big" "sync/atomic" @@ -233,6 +234,9 @@ func (chain *FakeChain) GetNativeContractScriptHash(name string) (util.Uint160, // GetHeaderHash implements Blockchainer interface. func (chain *FakeChain) GetHeaderHash(n int) util.Uint256 { + if n < 0 || n > math.MaxUint32 { + return util.Uint256{} + } return chain.hdrHashes[uint32(n)] } diff --git a/pkg/rpc/server/server.go b/pkg/rpc/server/server.go index 72932a704..6381dddb9 100644 --- a/pkg/rpc/server/server.go +++ b/pkg/rpc/server/server.go @@ -841,6 +841,9 @@ func (s *Server) contractIDFromParam(param *request.Param) (int32, *response.Err if err != nil { return 0, response.ErrInvalidParams } + if err := checkInt32(id); err != nil { + return 0, response.WrapErrorWithData(response.ErrInvalidParams, err) + } result = int32(id) default: return 0, response.ErrInvalidParams @@ -874,6 +877,9 @@ func (s *Server) contractScriptHashFromParam(param *request.Param) (util.Uint160 if err != nil { return result, response.ErrInvalidParams } + if err := checkInt32(id); err != nil { + return result, response.WrapErrorWithData(response.ErrInvalidParams, err) + } result, err = s.chain.GetContractScriptHash(int32(id)) if err != nil { return result, response.NewRPCError("Unknown contract", "", err) @@ -969,6 +975,9 @@ func (s *Server) getStateRoot(ps request.Params) (interface{}, *response.Error) var h util.Uint256 height, err := p.GetInt() if err == nil { + if err := checkUint32(height); err != nil { + return nil, response.WrapErrorWithData(response.ErrInvalidParams, err) + } rt, err = s.chain.GetStateModule().GetStateRoot(uint32(height)) } else if h, err = p.GetUint256(); err == nil { var hdr *block.Header diff --git a/pkg/rpc/server/util.go b/pkg/rpc/server/util.go new file mode 100644 index 000000000..bbacc9b2d --- /dev/null +++ b/pkg/rpc/server/util.go @@ -0,0 +1,20 @@ +package server + +import ( + "errors" + "math" +) + +func checkUint32(i int) error { + if i < 0 || i > math.MaxUint32 { + return errors.New("value should fit uint32") + } + return nil +} + +func checkInt32(i int) error { + if i < math.MinInt32 || i > math.MaxInt32 { + return errors.New("value should fit int32") + } + return nil +}