mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-24 15:12:00 +00:00
Code Issues Releases Wiki Activity

check archive: make robust_iterator more robust, fixes #4777

Browse source 
borg check must not crash if an archive metadata chunk does not decrypt.

Instead, report the chunk and skip to the next one.
This commit is contained in:
Thomas Waldmann 2022-04-07 01:22:34 +02:00
parent 6bb75ddf6b
commit ced3d8b9d5
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/borg/archive.py
View file

@ -1955,20 +1955,25 @@ def valid_item(obj):
if state > 0:
unpacker.resync()
for chunk_id, cdata in zip(items, repository.get_many(items)):
data = self.key.decrypt(chunk_id, cdata)
unpacker.feed(data)
try:
data = self.key.decrypt(chunk_id, cdata)
unpacker.feed(data)
for item in unpacker:
valid, reason = valid_item(item)
if valid:
yield Item(internal_dict=item)
else:
report('Did not get expected metadata dict when unpacking item metadata (%s)' % reason, chunk_id, i)
except IntegrityError as integrity_error:
# key.decrypt() detected integrity issues.
# maybe the repo gave us a valid cdata, but not for the chunk_id we wanted.
# or the authentication of cdata failed, meaning the encrypted data was corrupted.
report(str(integrity_error), chunk_id, i)
except msgpack.UnpackException:
report('Unpacker crashed while unpacking item metadata, trying to resync...', chunk_id, i)
unpacker.resync()
except Exception:
report('Exception while unpacking item metadata', chunk_id, i)
report('Exception while decrypting or unpacking item metadata', chunk_id, i)
raise
i += 1