beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

match the hashes version in reverse order (#156)

Browse source
This commit is contained in:
Thibault "bui" Koechlin 2020-07-29 15:02:52 +02:00 committed by GitHub
parent 773d0f4d84
commit acc0960c17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkg/cwhub/loader.go
View file

@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"io/ioutil"
"sort"
//"log"
@ -165,12 +166,19 @@ func parser_visit(path string, f os.FileInfo, err error) error {
continue
}
}
//wrong hash
sha, err := getSHA256(path)
if err != nil {
log.Fatalf("Failed to get sha of %s : %v", path, err)
}
for version, val := range v.Versions {
//let's reverse sort the versions to deal with hash collisions (#154)
versions := make([]string, 0, len(v.Versions))
for k := range v.Versions {
versions = append(versions, k)
}
sort.Sort(sort.Reverse(sort.StringSlice(versions)))
for _, version := range versions {
val := v.Versions[version]
if sha != val.Digest {
//log.Printf("matching filenames, wrong hash %s != %s -- %s", sha, val.Digest, spew.Sdump(v))
continue