octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2025-01-23 15:18:31 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4701 from MichaelEischer/better-streampack-errors

Browse Source 
repository: Improve StreamPack error messages
This commit is contained in:
Michael Eischer 2024-02-18 16:57:56 +01:00 committed by GitHub
commit cfbeb2cde5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/repository/repository.go
View File

@ -1079,7 +1079,7 @@ func (b *PackBlobIterator) Next() (PackBlobValue, error) {
skipBytes := int(entry.Offset - b.currentOffset) skipBytes := int(entry.Offset - b.currentOffset)
if skipBytes < 0 { if skipBytes < 0 {
return PackBlobValue{}, errors.Errorf("overlapping blobs in pack %v", b.packID) return PackBlobValue{}, fmt.Errorf("overlapping blobs in pack %v", b.packID)
} }
_, err := b.rd.Discard(skipBytes) _, err := b.rd.Discard(skipBytes)
@ -1099,30 +1099,33 @@ func (b *PackBlobIterator) Next() (PackBlobValue, error) {
n, err := io.ReadFull(b.rd, b.buf) n, err := io.ReadFull(b.rd, b.buf)
if err != nil { if err != nil {
debug.Log(" read error %v", err) debug.Log(" read error %v", err)
return PackBlobValue{}, errors.Wrap(err, "ReadFull") return PackBlobValue{}, fmt.Errorf("readFull: %w", err)
} }
if n != len(b.buf) { if n != len(b.buf) {
return PackBlobValue{}, errors.Errorf("read blob %v from %v: not enough bytes read, want %v, got %v", return PackBlobValue{}, fmt.Errorf("read blob %v from %v: not enough bytes read, want %v, got %v",
h, b.packID.Str(), len(b.buf), n) h, b.packID.Str(), len(b.buf), n)
} }
b.currentOffset = entry.Offset + entry.Length b.currentOffset = entry.Offset + entry.Length
if int(entry.Length) <= b.key.NonceSize() { if int(entry.Length) <= b.key.NonceSize() {
debug.Log("%v", b.blobs) debug.Log("%v", b.blobs)
return PackBlobValue{}, errors.Errorf("invalid blob length %v", entry) return PackBlobValue{}, fmt.Errorf("invalid blob length %v", entry)
} }
// decryption errors are likely permanent, give the caller a chance to skip them // decryption errors are likely permanent, give the caller a chance to skip them
nonce, ciphertext := b.buf[:b.key.NonceSize()], b.buf[b.key.NonceSize():] nonce, ciphertext := b.buf[:b.key.NonceSize()], b.buf[b.key.NonceSize():]
plaintext, err := b.key.Open(ciphertext[:0], nonce, ciphertext, nil) plaintext, err := b.key.Open(ciphertext[:0], nonce, ciphertext, nil)
if err != nil {
err = fmt.Errorf("decrypting blob %v from %v failed: %w", h, b.packID.Str(), err)
}
if err == nil && entry.IsCompressed() { if err == nil && entry.IsCompressed() {
// DecodeAll will allocate a slice if it is not large enough since it // DecodeAll will allocate a slice if it is not large enough since it
// knows the decompressed size (because we're using EncodeAll) // knows the decompressed size (because we're using EncodeAll)
b.decode, err = b.dec.DecodeAll(plaintext, b.decode[:0]) b.decode, err = b.dec.DecodeAll(plaintext, b.decode[:0])
plaintext = b.decode plaintext = b.decode
if err != nil { if err != nil {
err = errors.Errorf("decompressing blob %v failed: %v", h, err) err = fmt.Errorf("decompressing blob %v from %v failed: %w", h, b.packID.Str(), err)
} }
} }
if err == nil { if err == nil {
@ -1130,7 +1133,7 @@ func (b *PackBlobIterator) Next() (PackBlobValue, error) {
if !id.Equal(entry.ID) { if !id.Equal(entry.ID) {
debug.Log("read blob %v/%v from %v: wrong data returned, hash is %v", debug.Log("read blob %v/%v from %v: wrong data returned, hash is %v",
h.Type, h.ID, b.packID.Str(), id) h.Type, h.ID, b.packID.Str(), id)
err = errors.Errorf("read blob %v from %v: wrong data returned, hash is %v", err = fmt.Errorf("read blob %v from %v: wrong data returned, hash is %v",
h, b.packID.Str(), id) h, b.packID.Str(), id)
} }
} }