From b5f7f2376c962f68ce8d873ca734b378d2742c1a Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Thu, 7 Apr 2022 01:35:35 +0200 Subject: [PATCH] check archives: improve error handling for corrupt archive metadata block this is similar to #4777. borg check must not crash if an archive metadata block does not decrypt. Instead, report the archive_id, remove the archive from the manifest and skip to the next archive. --- src/borg/archive.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/borg/archive.py b/src/borg/archive.py index 1b78350af..d6f2db391 100644 --- a/src/borg/archive.py +++ b/src/borg/archive.py @@ -2007,13 +2007,19 @@ def valid_item(obj): logger.info(f'Analyzing archive {info.name} ({i + 1}/{num_archives})') archive_id = info.id if archive_id not in self.chunks: - logger.error('Archive metadata block is missing!') + logger.error('Archive metadata block %s is missing!', bin_to_hex(archive_id)) self.error_found = True del self.manifest.archives[info.name] continue mark_as_possibly_superseded(archive_id) cdata = self.repository.get(archive_id) - data = self.key.decrypt(archive_id, cdata) + try: + data = self.key.decrypt(archive_id, cdata) + except IntegrityError as integrity_error: + logger.error('Archive metadata block %s is corrupted: %s', bin_to_hex(archive_id), integrity_error) + self.error_found = True + del self.manifest.archives[info.name] + continue archive = ArchiveItem(internal_dict=msgpack.unpackb(data)) if archive.version != 1: raise Exception('Unknown archive metadata version')