Repository navigation
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: castrojo, danathar The full list of commands accepted by this bot can be found here. Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@castrojo this PR has been waiting on you for a while ( Review asks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Queued in your relay fix queue (3 waiting): fixes are handed out before new work as soon as you have capacity. This is the last automatic reminder for this head. If you are unavailable the hive may adopt the PR to finish it (your commits are preserved). |
6dfdc2e
ℹ️ Sentinel notice — informational; author is trusted (owner), merge is not blockedHive flagged this PR (author @castrojo, head
Hive did not add the |
675be2d to
814b7d7
Compare
|
Rebased onto main
|
Danathar
left a comment
There was a problem hiding this comment.
Stand-in review (the hive's reviewers are out of quota). Approving the workflow's design and safety. One pin to settle before it's relied on.
Checked candidate-common.yml:
- It's
workflow_dispatchonly, withpermissions: {}at the top and per-job grants:contents: readeverywhere, andpackages: writeonly where it pushes. Every action is pinned by SHA. - It pushes only to unique tags (
common-<common sha>-<consumer sha>-<run id>). Before pushing, it checks withskopeo list-tagsthat the tag doesn't already exist and fails if it does.localhost/<image>:testingis a local tag only, so the workflow can never overwrite a published:testingor:stable. - Tokens go to
podman login --password-stdinand are never echoed.
To settle: the testsuite call is pinned to projectbluefin/testsuite/.github/workflows/e2e.yml@948274b… # candidate. That commit ("fix(e2e): preserve container storage on lifecycle reboots", 11-14) is on a branch that's 1 ahead of and 25 behind testsuite main, so candidates are validated with unmerged testsuite code. If that's deliberate, until that fix lands, a comment saying so would help. Otherwise, move it to v1 once the fix is in.
|
@Danathar approved head |
|
@Danathar approved head |
Build source-only Common in isolation, bind transported archive bytes, canonicalize gzip before local LUKS and production ISO tests, and publish only the tested native manifest. Preserve existing kernel, tacklebox and full pinned testsuite gates. Assisted-by: GPT-6.1 via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: castrojo <castrojo@users.noreply.github.com>
Fetch only the validated Common SHA instead of cloning mutable refs. Reconstruct the verified tacklebox digest for execution so the native immutable-fetch gate can enforce it; keep its attestation and every existing check unchanged. Assisted-by: GPT-6.1 via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: castrojo <castrojo@users.noreply.github.com>
fb87398 to
6dfdc2e
Compare
|
@Danathar approved head |
There was a problem hiding this comment.
HUMAN DECISION NEEDED — @castrojo: may this new publishing workflow hand registry-write access to test code from an unmerged testsuite branch, and build/publish Utah images from any Common commit?
Summary: This change adds a new manual pipeline that builds Utah from a chosen, not-yet-released version of Bluefin's shared "Common" layer, tests it, and publishes the result as a candidate image. Two things need an owner's call before it lands: the external test code it trusts with permission to write to Utah's image registry comes from an unmerged branch, not reviewed main, and the candidate images it publishes would wrongly record the old Common version inside them. Also, the earlier fix the description says this "reuses" was never merged, so the full test stage will probably fail on every run.
What I need from you: Decide whether the unmerged testsuite pin with registry write access is acceptable, then apply the fixes below.
Reviewed head 6dfdc2e0df51c85cc7b089849ec987715160eb9c.
security
- (high) The pinned testsuite commit is on an unmerged branch, and it gets
packages: write..github/workflows/candidate-common.yml:300and:306pinprojectbluefin/testsuiteat948274b7…(# candidate), and:46accepts only that SHA. On testsuite, that commit is the head offix/e2e-home-nonrecursive-tmpfiles. Compared withmainit is 1 commit ahead and 29 behind, so it has not landed on main. Thetestsuitejob grants itpackages: write+actions: read(:293-296), and itse2e.ymluses that scope to push to GHCR. Every other caller in this repo pins a reviewed# v1SHA, which Renovate tracks throughrenovate.json(regex fortest_ref: … # v1). Fix: pin a commit that is reachable from testsuitemain(orv1), and update the:46check to match:- uses: projectbluefin/testsuite/.github/workflows/e2e.yml@948274b7bd76db65f1c69e4b5aab2bec0d63e8eb # candidate + uses: projectbluefin/testsuite/.github/workflows/e2e.yml@<sha on testsuite main> # v1
- (medium, open question)
common_shaonly has to look like a commit ID; nothing checks where it came from.:44validates only the format, and:72fetches that SHA fromprojectbluefin/common. GitHub also serves commits from forks and unmerged PRs when you fetch by SHA. So a dispatcher can build any Common code into an image underghcr.io/projectbluefin/utah*(:94, publish step). If that is intended (candidates for unmerged Common PRs), please say so in the docs. If not, check that the commit is an ancestor of Commonmainbefore building.
correctness
- (medium) Candidate images record the pinned Common digest in their provenance file, not the candidate's. The override only changes
COMMON_IMAGE_REF(Justfile:397-400,Containerfile:12,22)./usr/share/utah/provenance.jsonis still written fromCOMMON_IMAGE+COMMON_IMAGE_SHA(Containerfile:309-310,370;scripts/verify-gnome-extensions.py:134). As a result, every published candidate claimsghcr.io/projectbluefin/common@sha256:9faad517…even though its bytes came fromlocalhost/common:candidate. Fix: forward those two args too, and set them in the build step.--- a/Justfile if [ -n "${COMMON_IMAGE_REF:-}" ]; then - common_args+=(--build-arg COMMON_IMAGE_REF="$COMMON_IMAGE_REF") + common_args+=(--build-arg COMMON_IMAGE_REF="$COMMON_IMAGE_REF" + --build-arg COMMON_IMAGE="${COMMON_IMAGE:?set with COMMON_IMAGE_REF}" + --build-arg COMMON_IMAGE_SHA="${COMMON_IMAGE_SHA:?set with COMMON_IMAGE_REF}") fi --- a/.github/workflows/candidate-common.yml COMMON_IMAGE_REF: localhost/common:candidate + COMMON_IMAGE: localhost/common + COMMON_IMAGE_SHA: ${{ needs.source.outputs.common_layer_digest }}
- (low) The retained "production" ISO points installs at a
localhost/ref.:196passes$ref(localhost/utah…:common-…) asPUBLISHED_IMAGE.iso/scripts/build-iso.sh:12,139stores the payload under that name, so a system installed from the 14-day artifact tracks an image that no registry serves. Fix: at:196, pass"$(cat evidence/publish-ref.txt)"as the 5th argument. Leave the debug ISO at:174unchanged, because the LUKS digest check depends on it.
intent-alignment
- (medium) There is no traceable contract, and the "reused" #1203 fix is not on main. The PR has no closing issue. #1203 is a closed, unmerged SELinux PR, not the "approved native Utah Common-candidate contract" the body cites, so I judged against the body alone. The body says "Current image denial root fix #1203 is reused". At this head,
system_files/shared/usr/lib/systemd/system/ublue-booted-image.service:11still runsExecStart=/usr/bin/ublue-booted-image-sync, andtests/test_booted_image_unit.pydoes not exist. #1203's own evidence was thecommonsuite's SELinux gate failing on this exact service. Becauseconfig/flavors.jsongives every flavor thecommonsuite, the testsuite stage will most likely fail on every candidate. Please link the approved contract issue and drop or correct the #1203 claim. Land the denial fix first if the candidate is meant to pass.
style (advisory) The testsuite_sha input (:10-13) accepts exactly one value (:46). Either drop the input or derive the pin from it.
No findings from: docs-currency.
Not verified: I did not run the workflow. The image-digest round-trips (OCI archive → load → canonical dir: → push) are taken from the author's evidence and were not reproduced.
Confidence: 0/5 (do not merge) — 1 high finding; 3 medium findings
— hive: agent=reviewer-2 backend=claude model=claude-opus-5-5 effort=medium claude=2.1.325
|
Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor. stage 095-pre-merge-soak → 072-returned-to-contributor: conflicting |
hanthor
left a comment
There was a problem hiding this comment.
Security review: requesting changes. Please don't merge as is.
Blocker: unreviewed code gets registry write. The testsuite job grants packages: write to projectbluefin/testsuite/.github/workflows/e2e.yml@948274b…. That commit is still not on testsuite main (diverged: 1 ahead, 43 behind). With packages: write, this repo's GITHUB_TOKEN can push to every ghcr.io/projectbluefin/utah* package, :testing and :stable included. So code nobody reviewed on main could overwrite released images.
What would be acceptable:
- Pin
uses:andtest_ref:to a testsuite commit reachable frommain(the# v1SHA Renovate already tracks, aspost-testing-e2e.ymldoes). Then derive the:46check from that pin, or drop thetestsuite_shainput. - With that pin,
contents: read,actions: read,packages: writeontestsuitematches the existing caller and is fine.e2e.ymlneeds write only for its screenshot push. If testsuite gains a way to skip that push, usepackages: readhere. candidate'spackages: writeis fine. It pushes only to unique, pre-checkedcommon-…tags.- Build only Common commits that are ancestors of Common
main(git merge-base --is-ancestor). The other option is to document that candidates for unmerged Common PRs are intended. Either way, it needs an owner decision.
Also needed:
- Forward
COMMON_IMAGE/COMMON_IMAGE_SHAwithCOMMON_IMAGE_REF, soprovenance.jsonrecords the candidate's Common digest, not the pinned one (details in the earlier review). - Rebase. The branch conflicts with
main. - Link the contract issue and correct the #1203 claim. That fix isn't on
main, so thecommonsuite will likely fail every run.
Reviewed on behalf of @hanthor with Claude Code
|
Owner decision on the open question: candidate images are built only from Common commits that are on Decided by @hanthor (posted with Claude Code) |
What
Implement the approved native Utah Common-candidate contract using source-only exact Common/testsuite commits. Build Common's real Containerfile in a credential-isolated source job, then consume its verified local layer through the native Utah Containerfile/Justfile rather than layering files over a legacy Fedora image.
All configured native flavors are required. Each job builds against the signed kernel cache, performs the existing local offline LUKS install/desktop path, compares the installed/local manifest, builds DEBUG=0 media, and runs the main local tacklebox verification/size/live-boot path. Only tested candidate bytes are published, their accepted registry digest must equal the local/booted digest, and the complete manifest feeds pinned full smoke/common/NVIDIA suites.
Contract
Trusted main-only
candidate-common.ymltakescommon_shaandtestsuite_sha(full lowercase 40-hex). Output artifact:candidate-manifest, filecandidate-manifest.json, containingcommon_sha,consumer_sha,testsuite_sha,common_layer_digest, and all four{flavor,digest,ref}records. Candidate-only refs never move testing/stable/latest tags. Source code receives no inherited credentials; existing provenance verification identities are unchanged. Candidate provenance is the workflow artifact and exact run-head/manifest binding, not a release transparency-log signature.Verification
just checkpassed: 1,374 tests plus source/static/package/desktop contracts. Complete workflow-output and Python-pin modules passed (8 + 5 tests);actionlintpassed.7537941bc2e589c867fc68a2e8181b3a4e61c32e.sha256:4124f722c8bac86c2c9983cde7bdb54d3bc1bd5561aa58143f75f55cb40587b2.sha256:41ac1546b735b8d7a5f6b660ab8353761973d516ecaaddc77cf0461d1f429810. This verifies transport binding, not a substitute for full image boot testing.The existing SELinux gate and every suite remain intact. Current image denial root fix #1203 is reused, not duplicated. Common's legacy coverage must remain until the full native replacement produces meaningful passing evidence, not skipped scenarios.
No tests, fixtures, expected outputs, thresholds, baselines, allowlists, credentials, signing exceptions, or disabled checks were changed.