SystemSh0cker/gocsaf
1
0
Fork 0
mirror of https://github.com/gocsaf/csaf.git synced 2025-12-22 18:15:42 +01:00
Code Issues Releases Activity Actions

Simplified hashing

Browse source
This commit is contained in:
Sascha L. Teichmann 2021-12-15 12:54:07 +01:00
parent a561c74cf5
commit 10e1af232c
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
cmd/csaf_checker/processor.go
View file

@ -17,7 +17,6 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"hash"
"io" "io"
"net/http" "net/http"
"net/url" "net/url"
@ -182,6 +181,9 @@ func (p *processor) integrity(
return err return err
} }
client := p.httpClient() client := p.httpClient()
var data bytes.Buffer
for _, f := range files { for _, f := range files {
fp, err := url.Parse(f) fp, err := url.Parse(f)
if err != nil { if err != nil {
@ -202,19 +204,23 @@ func (p *processor) integrity(
u, res.StatusCode, res.Status) u, res.StatusCode, res.Status)
continue continue
} }
data, err := func() ([]byte, error) {
s256 := sha256.New()
s512 := sha512.New()
data.Reset()
hasher := io.MultiWriter(s256, s512, &data)
var doc interface{}
if err := func() error {
defer res.Body.Close() defer res.Body.Close()
return io.ReadAll(res.Body) tee := io.TeeReader(res.Body, hasher)
}() return json.NewDecoder(tee).Decode(&doc)
if err != nil { }(); err != nil {
lg("Reading %s failed: %v", u, err) lg("Reading %s failed: %v", u, err)
continue continue
} }
var doc interface{}
if err := json.Unmarshal(data, &doc); err != nil {
lg("Failed to unmarshal %s: %v", u, err)
continue
}
errors, err := csaf.ValidateCSAF(doc) errors, err := csaf.ValidateCSAF(doc)
if err != nil { if err != nil {
lg("Failed to validate %s: %v", u, err) lg("Failed to validate %s: %v", u, err)
@ -227,10 +233,10 @@ func (p *processor) integrity(
// Check hashes // Check hashes
for _, x := range []struct { for _, x := range []struct {
ext string ext string
hash func() hash.Hash hash []byte
}{ }{
{"sha256", sha256.New}, {"sha256", s256.Sum(nil)},
{"sha512", sha512.New}, {"sha512", s512.Sum(nil)},
} { } {
hashFile := u + "." + x.ext hashFile := u + "." + x.ext
p.checkTLS(hashFile) p.checkTLS(hashFile)
@ -255,13 +261,7 @@ func (p *processor) integrity(
p.addBadHash("No hash found in %s.", hashFile) p.addBadHash("No hash found in %s.", hashFile)
continue continue
} }
orig := x.hash() if !bytes.Equal(h, x.hash) {
if _, err := orig.Write(data); err != nil {
p.addBadHash("%s hashing of %s failed: %v.",
strings.ToUpper(x.ext), u, err)
continue
}
if !bytes.Equal(h, orig.Sum(nil)) {
p.addBadHash("%s hash of %s does not match %s.", p.addBadHash("%s hash of %s does not match %s.",
strings.ToUpper(x.ext), u, hashFile) strings.ToUpper(x.ext), u, hashFile)
} }
@ -296,7 +296,7 @@ func (p *processor) integrity(
} }
if len(p.keys) > 0 { if len(p.keys) > 0 {
pm := crypto.NewPlainMessage(data) pm := crypto.NewPlainMessage(data.Bytes())
t := crypto.GetUnixTime() t := crypto.GetUnixTime()
var verified bool var verified bool
for _, key := range p.keys { for _, key := range p.keys {