mirror of https://github.com/borgbackup/borg.git
verify_data: always decompress and call assert_id(), see #7362
This commit is contained in:
parent
fea630027c
commit
74a19ee2a0
|
@ -1837,12 +1837,6 @@ class ArchiveChecker:
|
||||||
chunks_count_index = len(self.chunks)
|
chunks_count_index = len(self.chunks)
|
||||||
chunks_count_segments = 0
|
chunks_count_segments = 0
|
||||||
errors = 0
|
errors = 0
|
||||||
# for the new crypto, derived from AEADKeyBase, we know that it checks authenticity on
|
|
||||||
# the crypto.low_level level - invalid chunks will fail to AEAD authenticate.
|
|
||||||
# for these key types, we know that there is no need to decompress the data afterwards.
|
|
||||||
# for all other modes, we assume that we must decompress, so we can verify authenticity
|
|
||||||
# based on the plaintext MAC (via calling ._assert_id(id, plaintext)).
|
|
||||||
decompress = not isinstance(self.key, AEADKeyBase)
|
|
||||||
defect_chunks = []
|
defect_chunks = []
|
||||||
pi = ProgressIndicatorPercent(
|
pi = ProgressIndicatorPercent(
|
||||||
total=chunks_count_index, msg="Verifying data %6.2f%%", step=0.01, msgid="check.verify_data"
|
total=chunks_count_index, msg="Verifying data %6.2f%%", step=0.01, msgid="check.verify_data"
|
||||||
|
@ -1872,7 +1866,8 @@ class ArchiveChecker:
|
||||||
chunk_data_iter = self.repository.get_many(chunk_ids)
|
chunk_data_iter = self.repository.get_many(chunk_ids)
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
self.repo_objs.parse(chunk_id, encrypted_data, decompress=decompress)
|
# we must decompress, so it'll call assert_id() in there:
|
||||||
|
self.repo_objs.parse(chunk_id, encrypted_data, decompress=True)
|
||||||
except IntegrityErrorBase as integrity_error:
|
except IntegrityErrorBase as integrity_error:
|
||||||
self.error_found = True
|
self.error_found = True
|
||||||
errors += 1
|
errors += 1
|
||||||
|
@ -1903,7 +1898,8 @@ class ArchiveChecker:
|
||||||
# from the underlying media.
|
# from the underlying media.
|
||||||
try:
|
try:
|
||||||
encrypted_data = self.repository.get(defect_chunk)
|
encrypted_data = self.repository.get(defect_chunk)
|
||||||
self.repo_objs.parse(defect_chunk, encrypted_data, decompress=decompress)
|
# we must decompress, so it'll call assert_id() in there:
|
||||||
|
self.repo_objs.parse(defect_chunk, encrypted_data, decompress=True)
|
||||||
except IntegrityErrorBase:
|
except IntegrityErrorBase:
|
||||||
# failed twice -> get rid of this chunk
|
# failed twice -> get rid of this chunk
|
||||||
del self.chunks[defect_chunk]
|
del self.chunks[defect_chunk]
|
||||||
|
|
Loading…
Reference in New Issue