From b51bda599bb35bdc362be8457deb1a827d5a561b Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Fri, 16 Oct 2026 11:59:14 +0000 Subject: [PATCH] fix: derive one release-platform allowlist and keep Intel refused prepare() and the artifact prefix now use the platform set captured from COMPONENT_KEYS at import. x86_64-darwin stays outside that set. A later mutation of COMPONENT_KEYS does not admit a platform, and prepare() refuses it with "release platforms refused" before it fetches artifacts. Co-authored-by: Sash --- scripts/package-release-binaries-test.py | 12 +++++++----- scripts/release-signer-test.py | 19 +++++++++++++++++++ scripts/release-signer.py | 17 +++++++++++++++-- 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/scripts/package-release-binaries-test.py b/scripts/package-release-binaries-test.py index a77b5022a..d64f89b02 100644 --- a/scripts/package-release-binaries-test.py +++ b/scripts/package-release-binaries-test.py @@ -48,11 +48,13 @@ def test_native_hosts_use_the_release_platform_names(self): def test_intel_package_key_is_the_release_id_the_signer_refuses(self): platforms = json.loads((ROOT / "scripts/release-platforms.json").read_text()) self.assertEqual(platforms["darwin-amd64"], "x86_64-darwin") - signer = (ROOT / "scripts/release-signer.py").read_text() - self.assertIn( - 'set(platforms) <= {"x86_64-linux", "aarch64-linux", "aarch64-darwin"}, "release platforms refused"', - signer, - ) + import importlib.util + spec = importlib.util.spec_from_file_location( + "release_signer_platforms", ROOT / "scripts/release-signer.py") + signer = importlib.util.module_from_spec(spec) + spec.loader.exec_module(signer) + self.assertNotIn("x86_64-darwin", signer.RELEASE_PLATFORMS) + self.assertEqual(signer.RELEASE_PLATFORMS, frozenset(signer.COMPONENT_KEYS)) result = package_name("Darwin", "x86_64") self.assertEqual(result.returncode, 0, result.stderr) self.assertEqual(result.stdout.strip(), "darwin-amd64") diff --git a/scripts/release-signer-test.py b/scripts/release-signer-test.py index 4174dd86e..23436684c 100644 --- a/scripts/release-signer-test.py +++ b/scripts/release-signer-test.py @@ -552,6 +552,25 @@ def test_signer_accepts_all_three_release_platforms(self): self.assertEqual(set(S.parse_json(prepared.release)["platforms"]), {"aarch64-darwin", "x86_64-linux", "aarch64-linux"}) + def test_prepare_refuses_a_platform_added_only_on_component_keys(self): + platform = copy.deepcopy(self.manifest["release"]["platforms"]["x86_64-linux"]) + self.manifest["release"]["platforms"]["x86_64-darwin"] = platform + (self.root / "elastos-x86_64-darwin").write_bytes(self.binary) + self.manifest["files"]["elastos-x86_64-darwin"] = copy.deepcopy( + self.manifest["files"]["elastos-x86_64-linux"]) + original = dict(S.COMPONENT_KEYS) + S.COMPONENT_KEYS["x86_64-darwin"] = ("darwin-amd64", "x86_64-darwin") + try: + self.assertNotIn("x86_64-darwin", S.RELEASE_PLATFORMS) + self.assertFalse(S.artifact_prefix_accepted("release-x86_64-darwin")) + self.assertTrue(S.artifact_prefix_accepted("release-mac")) + self.approve_manifest() + with self.assertRaisesRegex(ValueError, "release platforms refused"): + self.prepare() + finally: + S.COMPONENT_KEYS.clear() + S.COMPONENT_KEYS.update(original) + def test_annotated_tag_and_identical_main_are_supported(self): prefix = f"/repos/{S.REPOSITORY}" self.policy["tag_oid"] = TAG diff --git a/scripts/release-signer.py b/scripts/release-signer.py index 6b8dfb5f0..0f1d22700 100644 --- a/scripts/release-signer.py +++ b/scripts/release-signer.py @@ -451,6 +451,15 @@ def installer_template(policy, blob_oid, fetch): COMPONENT_KEYS = {"x86_64-linux": ("linux-amd64", "x86_64-linux"), "aarch64-linux": ("linux-arm64", "aarch64-linux"), "aarch64-darwin": ("darwin-arm64", "macos-arm64")} +# Frozen at import. prepare() and the artifact prefix both use this set. +# A later mutation of COMPONENT_KEYS does not admit a platform by itself. +RELEASE_PLATFORMS = frozenset(COMPONENT_KEYS) + + +def artifact_prefix_accepted(prefix): + names = ["mac" if platform == "aarch64-darwin" else platform for platform in sorted(RELEASE_PLATFORMS)] + names.append("seed") + return re.fullmatch(r"release-(?:proof-)?(?:" + "|".join(map(re.escape, names)) + ")", prefix) is not None def merge_components(template, manifests): @@ -619,7 +628,7 @@ def checked_package_run(approval, run_id, fetch): def package_artifact(approval, run, prefix, fetch): - require(re.fullmatch(r"release-(?:proof-)?(?:mac|x86_64-linux|aarch64-linux|seed)", prefix), "package artifact prefix refused") + require(artifact_prefix_accepted(prefix), "package artifact prefix refused") pattern = re.compile(rf"{prefix}-{approval['source']['commit']}-([1-9][0-9]*)\Z") matches = [] for page in range(1, 11): @@ -1061,6 +1070,10 @@ def prepare_from_root(policy, root, manifest_name, fetch, snapshot_root, held_ro usage = shutil.disk_usage(snapshot_root) require(usage.free >= total + 3 * MAX_JSON, "snapshot needs more free space than the volume has") + preview = manifest.get("release") + preview_platforms = preview.get("platforms") if type(preview) is dict else None + require(type(preview_platforms) is dict and preview_platforms + and set(preview_platforms) <= RELEASE_PLATFORMS, "release platforms refused") verify_release_provenance(policy, manifest, records, held_root, fetch, snapshot_root, root) for name, record in sorted(records.items()): destination = snapshot_root / name @@ -1081,7 +1094,7 @@ def prepare_from_root(policy, root, manifest_name, fetch, snapshot_root, held_ro if release["prev_release_cid"] is not None: cid_info(release["prev_release_cid"]) platforms = release["platforms"] - require(type(platforms) is dict and platforms and set(platforms) <= {"x86_64-linux", "aarch64-linux", "aarch64-darwin"}, "release platforms refused") + require(type(platforms) is dict and platforms and set(platforms) <= RELEASE_PLATFORMS, "release platforms refused") advertised = set() approved_refs = {(record["cid"], record["sha256"]) for record in records.values()} def admit_ref(cid, digest, size=None, release_path=None):