summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Waldmann <tw@waldmann-edv.de>2023-11-06 13:31:02 +0100
committerThomas Waldmann <tw@waldmann-edv.de>2023-11-06 13:31:02 +0100
commit9c886330d355f2d07e59d81853ea98e2bbc0a503 (patch)
tree22f9e71b767fcd4be73d01a958e38a0a09cd7f39
parent21d67b8295484c36e9a47767ce0a9be5e7c441a2 (diff)
CVE-2023-36811 upgrade docs: consider checkpoint archives, fixes #7802
The traceback seen there came from borg not showing a .checkpoint archive that didn't have a valid TAM and thus the user not see it / fix it: https://github.com/borgbackup/borg/issues/7802#issuecomment-1793860606
-rw-r--r--docs/changes.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/changes.rst b/docs/changes.rst
index e25173a3f..f797a9da6 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -50,7 +50,7 @@ no matter what encryption mode they use, including "none"):
b) If you get "Manifest TAM not found and not required", run
``borg upgrade --tam --force <repository>`` *on every client*.
-3. Run ``BORG_WORKAROUNDS=ignore_invalid_archive_tam borg list --format='{name} {time} tam:{tam}{NL}' <repo>``.
+3. Run ``BORG_WORKAROUNDS=ignore_invalid_archive_tam borg list --consider-checkpoints --format='{name} {time} tam:{tam}{NL}' <repo>``.
"tam:verified" means that the archive has a valid TAM authentication.
"tam:none" is expected as output for archives created by borg <1.0.9.
"tam:none" is also expected for archives resulting from a borg rename
@@ -66,7 +66,7 @@ no matter what encryption mode they use, including "none"):
Run ``BORG_WORKAROUNDS=ignore_invalid_archive_tam borg upgrade --archives-tam <repo>``.
This will unconditionally add a correct archive TAM to all archives not having one.
``borg check`` would consider TAM-less or invalid-TAM archives as garbage or a potential attack.
- To see that all archives now are "tam:verified" run: ``borg list --format='{name} {time} tam:{tam}{NL}' <repo>``
+ To see that all archives now are "tam:verified" run: ``borg list --consider-checkpoints --format='{name} {time} tam:{tam}{NL}' <repo>``
5. Please note that you should never use BORG_WORKAROUNDS=ignore_invalid_archive_tam
for normal production operations - it is only needed once to get the archives in a