alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Merge pull request #408 from benmur/validate-pack-checksums

Browse source 
checker: Validate pack checksums before unpacking
This commit is contained in:
Alexander Neumann 2016-02-05 19:45:21 +01:00
commit 789e0df49e
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
checker/checker.go
View file

@ -652,6 +652,12 @@ func checkPack(r *repository.Repository, id backend.ID) error {
return err return err
} }
hash := backend.Hash(buf)
if !hash.Equal(id) {
debug.Log("Checker.checkPack", "Pack ID does not match, want %v, got %v", id.Str(), hash.Str())
return fmt.Errorf("Pack ID does not match, want %v, got %v", id.Str(), hash.Str())
}
unpacker, err := pack.NewUnpacker(r.Key(), bytes.NewReader(buf)) unpacker, err := pack.NewUnpacker(r.Key(), bytes.NewReader(buf))
if err != nil { if err != nil {
return err return err
@ -671,8 +677,8 @@ func checkPack(r *repository.Repository, id backend.ID) error {
hash := backend.Hash(plainBuf) hash := backend.Hash(plainBuf)
if !hash.Equal(blob.ID) { if !hash.Equal(blob.ID) {
debug.Log("Checker.checkPack", " ID does not match, want %v, got %v", blob.ID.Str(), hash.Str()) debug.Log("Checker.checkPack", " Blob ID does not match, want %v, got %v", blob.ID.Str(), hash.Str())
errs = append(errs, fmt.Errorf("ID does not match, want %v, got %v", blob.ID.Str(), hash.Str())) errs = append(errs, fmt.Errorf("Blob ID does not match, want %v, got %v", blob.ID.Str(), hash.Str()))
continue continue
} }
} }