Skip to content

Commit

Permalink
chore: codeql changes (cosmos#20091)
Browse files Browse the repository at this point in the history
  • Loading branch information
tac0turtle authored Apr 20, 2024
1 parent d41aa7a commit 13cf11a
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 44 deletions.
11 changes: 11 additions & 0 deletions .github/codeql/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
packs:
- crypto-com/cosmos-sdk-codeql
queries:
- uses: security-and-quality
- uses: security-experimental
- uses: security-extended
paths-ignore:
- api
- '**/*_test.go'
- '**/*.pulsar.go'
- '**/*.pb.gp'
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
uses: github/codeql-action/init@v3
with:
languages: "go"
queries: +security-and-quality,github/codeql/go/ql/src/experimental/InconsistentCode/DeferInLoop.ql@main,github/codeql/go/ql/src/experimental/Unsafe/WrongUsageOfUnsafe.ql@main,github/codeql/go/ql/src/experimental/CWE-369/DivideByZero.ql@main
packs: +crypto-com/cosmos-sdk-codeql
config-file: ./.github/codeql/config.yml

# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
Expand Down
16 changes: 13 additions & 3 deletions crypto/keys/bcrypt/bcrypt.go
Original file line number Diff line number Diff line change
Expand Up @@ -268,15 +268,15 @@ func (p *hashed) decodeVersion(sbytes []byte) (int, error) {

// decodeCost sbytes should begin where decodeVersion left off.
func (p *hashed) decodeCost(sbytes []byte) (int, error) {
cost, err := strconv.Atoi(string(sbytes[0:2]))
cost, err := strconv.ParseUint(string(sbytes[0:2]), 10, 32)
if err != nil {
return -1, err
}
err = checkCost(uint32(cost))
err = checkCost(uint64to32(cost))
if err != nil {
return -1, err
}
p.cost = uint32(cost)
p.cost = uint64to32(cost)
return 3, nil
}

Expand All @@ -290,3 +290,13 @@ func checkCost(cost uint32) error {
}
return nil
}

// uint64to32 converts a uint64 value to a uint32 value.
// If the input value is greater than 0xFFFFFFFF, it returns 0xFFFFFFFF.
// Otherwise, it returns the input value converted to uint32.
func uint64to32(u uint64) uint32 {
if u > 0xFFFFFFFF {
return 0xFFFFFFFF
}
return uint32(u)
}
6 changes: 3 additions & 3 deletions store/db/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ type RawDBType string

const (
DBTypeGoLevelDB RawDBType = "goleveldb"
DBTypeRocksDB = "rocksdb"
DBTypePebbleDB = "pebbledb"
DBTypePrefixDB = "prefixdb"
DBTypeRocksDB RawDBType = "rocksdb"
DBTypePebbleDB RawDBType = "pebbledb"
DBTypePrefixDB RawDBType = "prefixdb"

DBFileSuffix string = ".db"
)
Expand Down
36 changes: 0 additions & 36 deletions store/db/rocksdb_noflag.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,39 +50,3 @@ func (db *RocksDB) NewBatch() store.RawBatch {
func (db *RocksDB) NewBatchWithSize(_ int) store.RawBatch {
return db.NewBatch()
}

var _ corestore.Iterator = (*rocksDBIterator)(nil)

type rocksDBIterator struct{}

func (itr *rocksDBIterator) Domain() (start, end []byte) {
panic("rocksdb must be built with -tags rocksdb")
}

func (itr *rocksDBIterator) Valid() bool {
panic("rocksdb must be built with -tags rocksdb")
}

func (itr *rocksDBIterator) Key() []byte {
panic("rocksdb must be built with -tags rocksdb")
}

func (itr *rocksDBIterator) Value() []byte {
panic("rocksdb must be built with -tags rocksdb")
}

func (itr *rocksDBIterator) Next() {
panic("rocksdb must be built with -tags rocksdb")
}

func (itr *rocksDBIterator) Error() error {
panic("rocksdb must be built with -tags rocksdb")
}

func (itr *rocksDBIterator) Close() error {
panic("rocksdb must be built with -tags rocksdb")
}

func (itr *rocksDBIterator) assertIsValid() {
panic("rocksdb must be built with -tags rocksdb")
}

0 comments on commit 13cf11a

Please sign in to comment.