From b03c99aa969678fd4d61e70ca67ea07acad0bbe7 Mon Sep 17 00:00:00 2001
From: Serge Hallyn <serge@hallyn.com>
Date: Mon, 28 Aug 2023 11:22:21 -0500
Subject: [PATCH] ReplaceManifestCert: also append pcr7data to the initrd

Signed-off-by: Serge Hallyn <serge@hallyn.com>
---
 pkg/trust/artifacts.go | 41 +++++++++++++++++++++++++++++------------
 pkg/trust/utils.go     | 14 ++++++++++++++
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/pkg/trust/artifacts.go b/pkg/trust/artifacts.go
index 0ae1280..11f446b 100644
--- a/pkg/trust/artifacts.go
+++ b/pkg/trust/artifacts.go
@@ -234,8 +234,8 @@ func SetupBootkit(keysetName, bootkitVersion string) error {
 		return errors.Wrapf(err, "Failed updating the shim")
 	}
 
-	// break apart kernel.efi to replace the manifestCert.pem
-	newKernel, err := ReplaceManifestCert(bDir, filepath.Join(keysetPath, "manifest-ca", "cert.pem"))
+	// break apart kernel.efi to replace the manifestCA.pem
+	newKernel, err := ReplaceManifestCert(bDir, keysetPath)
 	if err != nil {
 		return errors.Wrapf(err, "Failed replacing manifest certificate")
 	}
@@ -341,24 +341,40 @@ func appendToFile(dest, src string) error {
 }
 
 // Given a tempdir with bootkit artifacts, update it for our keyset.  In
-// initrd, add newcert as /manifestCert.pem.  Build
+// initrd, add newcert as /manifestCA.pem.  Build
 // a new kernel.efi and return that filename.  Note that the filename
 // will always be ${dir}/newkernel.efi, but whatever.
-func ReplaceManifestCert(dir, newCert string) (string, error) {
-	emptydir := filepath.Join(dir, "empty")
-	if err := EnsureDir(emptydir); err != nil {
-		return "", errors.Wrapf(err, "Failed creating empty directory")
+func ReplaceManifestCert(dir, keysetPath string) (string, error) {
+	newCert := filepath.Join(keysetPath, "manifest-ca", "cert.pem")
+
+	pcr7Dir := filepath.Join(keysetPath, "pcr7data")
+	if !PathExists(pcr7Dir) {
+		return "", fmt.Errorf("No pcr7data found")
+	}
+	pcr7Cpio := pcr7Dir + ".cpio"
+	if !PathExists(pcr7Cpio) {
+		if err := NewCpio(pcr7Cpio, pcr7Dir); err != nil {
+			return "", errors.Wrapf(err, "Failed creating pcr7 cpio for %s", filepath.Base(keysetPath))
+		}
 	}
+
 	initrd := filepath.Join(dir, "initrd.new")
 	initrdgz := initrd + ".gz"
+	certCpio := filepath.Join(dir, "newcert.initrd")
+
+	emptydir, err := os.MkdirTemp("", "trust-cpio")
+	if err != nil {
+		return "", err
+	}
+	defer os.RemoveAll(emptydir)
 
-	if err := CopyFile(newCert, filepath.Join(emptydir, "manifestCA.pem")); err != nil {
+	manifestCA := filepath.Join(emptydir, "manifestCA.pem")
+	if err := CopyFile(newCert, manifestCA); err != nil {
 		return "", errors.Wrapf(err, "Failed copying manifest into empty dir")
 	}
 
-	bashcmd := "cd " + emptydir + "; echo ./manifestCA.pem | cpio --create --owner=+0:+0 -H newc --quiet > " + filepath.Join(dir, "newcert.initrd")
-	if err := RunCommand("/bin/bash", "-c", bashcmd); err != nil {
-		return "", errors.Wrapf(err, "Failed creating new manifest initrd piece")
+	if err := NewCpio(certCpio, manifestCA); err != nil {
+		return "", errors.Wrapf(err, "Failed creating cpio archive of manifest cert")
 	}
 
 	// Collect the pieces (bootkit api should do this for us)
@@ -367,7 +383,8 @@ func ReplaceManifestCert(dir, newCert string) (string, error) {
 		filepath.Join(dir, "initrd/core.cpio.gz"),
 		filepath.Join(dir, "kernel/initrd-modules.cpio.gz"),
 		filepath.Join(dir, "mos/initrd-mos.cpio.gz"),
-		filepath.Join(dir, "newcert.initrd"),
+		pcr7Cpio,
+		certCpio,
 	}
 	for _, f := range files {
 		if strings.HasSuffix(f, ".gz") {
diff --git a/pkg/trust/utils.go b/pkg/trust/utils.go
index 5782b8e..91f1e78 100644
--- a/pkg/trust/utils.go
+++ b/pkg/trust/utils.go
@@ -189,3 +189,17 @@ func getMosKeyPath() (string, error) {
 	}
 	return filepath.Join(dataDir, "machine", "trust", "keys"), nil
 }
+
+// Just create a cpio file.  @path will be the top level directory
+// or the file in the new cpio file index.
+func NewCpio(cpio, path string) error {
+	parent := filepath.Dir(path)
+	target := filepath.Base(path)
+
+	bashcmd := "cd " + parent + "; find " + target + "| cpio --create --owner=+0:+0 -H newc --quiet > " + cpio
+	if err := RunCommand("/bin/bash", "-c", bashcmd); err != nil {
+		return errors.Wrapf(err, "Failed creating cpio of %s -> %s", path, cpio)
+	}
+
+	return nil
+}