mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-27 10:18:12 +00:00
Code Issues Releases Wiki Activity

check: improve logging for TAM issues, fixes #7797

Browse source
This commit is contained in:
Thomas Waldmann 2023-09-01 15:00:51 +02:00
parent 270f33b7ed
commit 1338646b9d
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/borg/archive.py
View file

@ -1999,13 +1999,17 @@ def valid_archive(obj):
# are likely looking at an archive item here, also check the TAM authentication: # are likely looking at an archive item here, also check the TAM authentication:
try: try:
archive, verified, _ = self.key.unpack_and_verify_archive(data, force_tam_not_required=False) archive, verified, _ = self.key.unpack_and_verify_archive(data, force_tam_not_required=False)
except IntegrityError: except IntegrityError as integrity_error:
# TAM issues - do not accept this archive! # TAM issues - do not accept this archive!
# either somebody is trying to attack us with a fake archive data or # either somebody is trying to attack us with a fake archive data or
# we have an ancient archive made before TAM was a thing (borg < 1.0.9) **and** this repo # we have an ancient archive made before TAM was a thing (borg < 1.0.9) **and** this repo
# was not correctly upgraded to borg 1.2.5 (see advisory at top of the changelog). # was not correctly upgraded to borg 1.2.5 (see advisory at top of the changelog).
# borg can't tell the difference, so it has to assume this archive might be an attack # borg can't tell the difference, so it has to assume this archive might be an attack
# and drops this archive. # and drops this archive.
name = archive.get(b"name", b"<unknown>").decode("ascii", "replace")
logger.error("Archive TAM authentication issue for archive %s: %s", name, integrity_error)
logger.error("This archive will *not* be added to the rebuilt manifest! It will be deleted.")
self.error_found = True
continue continue
# note: if we get here and verified is False, a TAM is not required. # note: if we get here and verified is False, a TAM is not required.
archive = ArchiveItem(internal_dict=archive) archive = ArchiveItem(internal_dict=archive)
@ -2271,6 +2275,7 @@ def valid_item(obj):
# when upgrading to borg 1.2.5, users are expected to TAM-authenticate all archives they # when upgrading to borg 1.2.5, users are expected to TAM-authenticate all archives they
# trust, so there shouldn't be any without TAM. # trust, so there shouldn't be any without TAM.
logger.error("Archive TAM authentication issue for archive %s: %s", info.name, integrity_error) logger.error("Archive TAM authentication issue for archive %s: %s", info.name, integrity_error)
logger.error("This archive will be *removed* from the manifest! It will be deleted.")
self.error_found = True self.error_found = True
del self.manifest.archives[info.name] del self.manifest.archives[info.name]
continue continue