diff --git a/CHANGELOG.md b/CHANGELOG.md index 24fd9ca..2cd2b9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ Unreleased - Removed `resources/licenselookup.json`; use `licenses.LICENSELIST` - Added `kolibri-constants/Licenses` - `licenses.generate_list` no longer casts ids to `int` or fills `description` + - `archive.contents_sha256` reads members in stored order 0.2.17 Apr 13, 2026 diff --git a/le_utils/archive.py b/le_utils/archive.py index 7ac6ff5..d49d98f 100644 --- a/le_utils/archive.py +++ b/le_utils/archive.py @@ -32,7 +32,8 @@ def contents_sha256(fileobj): if path in members: raise ValueError(f"Duplicate member path {path!r}") members[path] = info + member_digests = {path: _member_sha256(zf, info) for path, info in sorted(members.items(), key=lambda item: item[1].header_offset)} digest = hashlib.sha256() - for path in sorted(members): - digest.update(f"{path}\0{_member_sha256(zf, members[path])}\n".encode("utf-8")) + for path, member_digest in sorted(member_digests.items()): + digest.update(f"{path}\0{member_digest}\n".encode("utf-8")) return digest.hexdigest() diff --git a/tests/test_archive.py b/tests/test_archive.py index 70e258a..4c856f3 100644 --- a/tests/test_archive.py +++ b/tests/test_archive.py @@ -1,4 +1,5 @@ import io +import itertools import struct import zipfile import zlib @@ -36,6 +37,32 @@ def test_contents_sha256_ignores_member_order(): assert contents_sha256(_zip(reversed(MEMBERS))) == EXPECTED_DIGEST +class _SeekRecorder(io.BytesIO): + def __init__(self): + super().__init__() + self.positions = [] + + def seek(self, *args): + position = super().seek(*args) + self.positions.append(position) + return position + + +def test_contents_sha256_reads_members_in_stored_order(): + archive = _SeekRecorder() + with zipfile.ZipFile(archive, "w", zipfile.ZIP_DEFLATED) as zf: + for name, data in sorted(MEMBERS, reverse=True): + zf.writestr(name, data) + zf.filelist.append(zf.filelist.pop(0)) + offsets = [info.header_offset for info in zipfile.ZipFile(archive).infolist()] + assert offsets != sorted(offsets) + start_dir = zipfile.ZipFile(archive).start_dir + archive.positions.clear() + assert contents_sha256(archive) == EXPECTED_DIGEST + member_seeks = list(itertools.dropwhile(lambda position: position >= start_dir, archive.positions)) + assert member_seeks == sorted(member_seeks) + + def test_contents_sha256_ignores_directory_entries(): directories = [("css/", b""), ("css/site/", b""), ("données/", b"")] assert contents_sha256(_zip(directories + MEMBERS)) == EXPECTED_DIGEST