diff --git a/scripts/package-release-binaries-test.py b/scripts/package-release-binaries-test.py index 1bd0f5335..6ae5fdf56 100644 --- a/scripts/package-release-binaries-test.py +++ b/scripts/package-release-binaries-test.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 """Package names and binary checks for scripts/package-release-binaries.sh.""" +import importlib.util import json import os import shutil @@ -125,6 +126,12 @@ def test_intel_name_fails_closed_without_a_clear_sysctl_answer(self): def test_intel_package_key_prints_and_packaging_refuses_the_tarball(self): platforms = json.loads((ROOT / "scripts/release-platforms.json").read_text()) self.assertEqual(platforms["darwin-amd64"], "x86_64-darwin") + # The release id behind that key is outside the signer's allowlist. + 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(platforms["darwin-amd64"], signer.RELEASE_PLATFORMS) printed = package_name("Darwin", "x86_64") self.assertEqual(printed.returncode, 0, printed.stderr) self.assertEqual(printed.stdout.strip(), "darwin-amd64") diff --git a/scripts/release-signer-test.py b/scripts/release-signer-test.py index 050e40c0c..a5569a318 100644 --- a/scripts/release-signer-test.py +++ b/scripts/release-signer-test.py @@ -664,6 +664,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 7f53f004f..0f1d22700 100644 --- a/scripts/release-signer.py +++ b/scripts/release-signer.py @@ -99,9 +99,6 @@ CAPSULE_RECORD_SCHEMA = "elastos.capsule.record/v1" # A release is one UnixFS chunk; Runtime refuses larger release metadata. MAX_RELEASE_METADATA = 256 * 1024 -# The signed release ids. Package keys live in scripts/release-platforms.json. -# x86_64-darwin is mapped there and is absent from this set. -SIGNED_RELEASE_PLATFORMS = frozenset({"x86_64-linux", "aarch64-linux", "aarch64-darwin"}) def require(condition, message): @@ -109,11 +106,6 @@ def require(condition, message): raise ValueError(message) -def require_signed_release_platforms(platforms): - require(type(platforms) is dict and platforms and set(platforms) <= SIGNED_RELEASE_PLATFORMS, - "release platforms refused") - - def sha256(data): return hashlib.sha256(data).hexdigest() @@ -459,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): @@ -627,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): @@ -1049,9 +1050,6 @@ def prepare_from_root(policy, root, manifest_name, fetch, snapshot_root, held_ro require(sha256(manifest_data) == checked_hash(policy.get("manifest_sha256")), "manifest differs from operator approval") manifest = parse_json(manifest_data) require(set(manifest) == {"source", "version", "channel", "files", "installer", "release", "head", "provenance"}, "signing input fields refused") - # Refuse an unsigned platform before provenance or any signature bytes. - if type(manifest.get("release")) is dict and type(manifest["release"].get("platforms")) is dict: - require_signed_release_platforms(manifest["release"]["platforms"]) source = {field: policy[field] for field in ("commit", "tree")} require(manifest["source"] == source and manifest["version"] == policy["version"] and manifest["channel"] == policy["channel"], "input source/version/channel differs") records = manifest["files"] @@ -1072,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 @@ -1092,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_signed_release_platforms(platforms) + 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):