From e2c44d9b34bbb9f9882be808cc44b6d551d75edb Mon Sep 17 00:00:00 2001
From: Colin Walters <walters+llm@verbum.org>
Date: Fri, 25 Sep 2026 07:53:26 -0400
Subject: [PATCH] build: Key the Secure Boot signing layers on the certificate

Build secrets aren't part of the layer cache key, so the steps that
sign systemd-boot and the UKIs can be served from cache after the test
keys change: after `target/` is wiped and the keys regenerated, or from
another checkout sharing the same container storage. The result is an
image signed with a key the VM firmware doesn't trust, which fails to
boot with "Access Denied" in a way that looks like a real Secure Boot
bug.

Copy the public certificate into each signing stage from a build
context, and print its checksum when signing. Copied content is part
of the cache key, so a different certificate rebuilds those steps.
Only the certificate is copied; the private key stays a secret.

Generated-by: AI
Signed-off-by: Colin Walters <walters@verbum.org>
---
 Dockerfile                   | 8 ++++++++
 Justfile                     | 4 +++-
 tmt/tests/Dockerfile.upgrade | 4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 963ec12c7..c6b825dba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -251,6 +251,9 @@ EORUN
 
 # This image signs systemd-boot using our key, and writes the resulting binary into /out
 FROM tools as sdboot-signed
+# The certificate is also a build secret, but secrets aren't part of the layer
+# cache key. Copying it in makes the signing below rebuild when it changes.
+COPY --from=secureboot db.crt /usr/lib/bootc-test/secureboot-db.crt
 # The secureboot key and cert are passed via Justfile
 # We write the signed binary into /out
 # Note: /out already contains systemd-boot-unsigned RPM from initialize-sealing-tools
@@ -258,6 +261,7 @@ RUN --network=none --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp
     --mount=type=secret,id=secureboot_key \
     --mount=type=secret,id=secureboot_cert <<EORUN
 set -xeuo pipefail
+sha256sum /usr/lib/bootc-test/secureboot-db.crt
 
 # Extract the unsigned systemd-boot binary from the downloaded RPM
 # Work around https://github.com/bootc-dev/bootc/issues/1896
@@ -359,6 +363,9 @@ ARG erofs_version=auto
 RUN --network=none --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp \
     --mount=type=bind,from=packages,src=/,target=/run/packages \
     rpm -Uvh --oldpackage --replacepkgs --nosignature /run/packages/bootc-*.rpm
+# The certificate is also a build secret, but secrets aren't part of the layer
+# cache key. Copying it in makes the signing below rebuild when it changes.
+COPY --from=secureboot db.crt /usr/lib/bootc-test/secureboot-db.crt
 RUN --network=none --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp \
     --mount=type=secret,id=secureboot_key \
     --mount=type=secret,id=secureboot_cert \
@@ -366,6 +373,7 @@ RUN --network=none --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp
     --mount=type=bind,from=packaging,src=/,target=/run/packaging \
     --mount=type=bind,from=base-penultimate,src=/,target=/run/target <<EORUN
 set -xeuo pipefail
+sha256sum /usr/lib/bootc-test/secureboot-db.crt
 
 allow_missing_verity=()
 
diff --git a/Justfile b/Justfile
index 3679c2e0f..f140c3bfb 100644
--- a/Justfile
+++ b/Justfile
@@ -81,7 +81,8 @@ base_buildargs := generic_buildargs + " " + _extra_src_args \
                   + " --build-arg=baseconfigs=" + baseconfigs
 buildargs := base_buildargs \
              + " --cap-add=all --security-opt=label=type:container_runtime_t --device /dev/fuse" \
-             + " --secret=id=secureboot_key,src=target/test-secureboot/db.key --secret=id=secureboot_cert,src=target/test-secureboot/db.crt"
+             + " --secret=id=secureboot_key,src=target/test-secureboot/db.key --secret=id=secureboot_cert,src=target/test-secureboot/db.crt" \
+             + " --build-context=secureboot=target/test-secureboot"
 
 # ============================================================================
 # Core workflows - the main targets most developers will use
@@ -517,6 +518,7 @@ _build-upgrade-image:
         --build-arg "erofs_version={{erofs_version}}" \
         --secret=id=secureboot_key,src=target/test-secureboot/db.key \
         --secret=id=secureboot_cert,src=target/test-secureboot/db.crt \
+        --build-context=secureboot=target/test-secureboot \
         "${extra_args[@]}" \
         -t {{upgrade_img}} \
         -f tmt/tests/Dockerfile.upgrade \
diff --git a/tmt/tests/Dockerfile.upgrade b/tmt/tests/Dockerfile.upgrade
index 1d7aa0e03..2af2c2da0 100644
--- a/tmt/tests/Dockerfile.upgrade
+++ b/tmt/tests/Dockerfile.upgrade
@@ -44,6 +44,9 @@ RUN --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp \
 # container ukify command it provides is needed for seal-uki.
 FROM tools AS sealed-upgrade-uki
 ARG boot_type seal_state filesystem erofs_version
+# The certificate is also a build secret, but secrets aren't part of the layer
+# cache key. Copying it in makes the signing below rebuild when it changes.
+COPY --from=secureboot db.crt /usr/lib/bootc-test/secureboot-db.crt
 RUN --network=none --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp \
     --mount=type=secret,id=secureboot_key \
     --mount=type=secret,id=secureboot_cert \
@@ -51,6 +54,7 @@ RUN --network=none --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp
     --mount=type=bind,from=kernel,src=/,target=/run/kernel \
     --mount=type=bind,from=upgrade-base,src=/,target=/run/target <<EORUN
 set -xeuo pipefail
+sha256sum /usr/lib/bootc-test/secureboot-db.crt
 
 allow_missing_verity=()