From 8c2ef48e7d8c99794b2935ce93074d0130fe6d51 Mon Sep 17 00:00:00 2001 From: clover caruso Date: Sat, 17 Oct 2026 03:07:46 -0700 Subject: [PATCH] Skip Zig mirror operational files during verification --- service/zig-mirror/build/mirror.py | 2 ++ tools/zig-mirror-test.py | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/service/zig-mirror/build/mirror.py b/service/zig-mirror/build/mirror.py index 38771870ba1b1c84c3464f810be5da863b8dd105..edce20bd3971648db68b0cd09f3741b9d0733cb2 100644 --- a/service/zig-mirror/build/mirror.py +++ b/service/zig-mirror/build/mirror.py @@ -159,6 +159,8 @@ class Mirror: if isinstance(item, dict) and 'tarball' in item} checked = 0 for artifact in sorted(self.root.rglob('zig-*')): + if any(part.startswith('.') for part in artifact.relative_to(self.root).parts): + continue if not artifact.is_file() or artifact.name.endswith('.minisig'): continue filename(artifact.name) diff --git a/tools/zig-mirror-test.py b/tools/zig-mirror-test.py index f64d374451022e2f5ceb3d6961fdad8c39bf49b7..e01d208385c01f9bca896f3eb1032b8945089612 100644 --- a/tools/zig-mirror-test.py +++ b/tools/zig-mirror-test.py @@ -106,6 +106,21 @@ class MirrorTests(unittest.TestCase): with self.assertRaises(mirror.Unavailable): self.cache.verify() + def test_verify_ignores_download_locks_and_pending_archives(self): + name = 'zig-0.5.0.tar.xz' + body = b'verified historical archive' + checksum = mirror.hashlib.sha256(body).hexdigest() + with patch.object(mirror, 'fetch', side_effect=lambda url, target, limit: target.write_bytes(body)): + artifact = self.cache.ensure(name, checksum=checksum) + self.assertEqual((self.cache.root / '.mirror-locks' / name).stat().st_size, 0) + pending = artifact.parent / '.download-pending' / name + pending.parent.mkdir() + pending.write_bytes(b'incomplete corrupt bytes') + entries = {'0.5.0': {'src': {'tarball': mirror.upstream(name), 'shasum': checksum}}} + with patch.object(mirror, 'index', return_value=entries), contextlib.redirect_stdout(io.StringIO()) as output: + self.cache.verify() + self.assertEqual(json.loads(output.getvalue()), {'verifiedArtifacts': 1}) + def test_http_query_range_head_denials_and_timeout(self): target = self.cache.path('zig-0.17.0.tar.xz') target.parent.mkdir() -- 2.54.1