add verity to EMU API

toolkit/tools/osmodifierapi/os.go

@@ -17,6 +17,7 @@ type OS struct {
 	SELinux  imagecustomizerapi.SELinux `yaml:"selinux"`
 	Users    []imagecustomizerapi.User  `yaml:"users"`
 	Overlays *[]Overlay                 `yaml:"overlays"`
+	Verity   *imagecustomizerapi.Verity `yaml:"verity"`
 }
 
 func (s *OS) IsValid() error {
@@ -65,5 +66,12 @@ func (s *OS) IsValid() error {
 		}
 	}
 
+	// if s.Verity != nil {
+	// 	err = s.Verity.IsValid()
+	// 	if err != nil {
+	// 		return fmt.Errorf("invalid verity:\n%w", err)
+	// 	}
+	// }
+
 	return nil
 }

toolkit/tools/pkg/imagecustomizerlib/customizeverity.go

@@ -113,7 +113,7 @@ func updateGrubConfigForVerity(dataPartitionIdType imagecustomizerapi.IdType, da
 		return err
 	}
 
-	formattedCorruptionOption, err := systemdFormatCorruptionOption(corruptionOption)
+	formattedCorruptionOption, err := SystemdFormatCorruptionOption(corruptionOption)
 	if err != nil {
 		return err
 	}
@@ -218,7 +218,7 @@ func systemdFormatPartitionId(idType imagecustomizerapi.IdType, id string) (stri
 	}
 }
 
-func systemdFormatCorruptionOption(corruptionOption imagecustomizerapi.CorruptionOption) (string, error) {
+func SystemdFormatCorruptionOption(corruptionOption imagecustomizerapi.CorruptionOption) (string, error) {
 	switch corruptionOption {
 	case imagecustomizerapi.CorruptionOptionDefault, imagecustomizerapi.CorruptionOptionIoError:
 		return "", nil

toolkit/tools/pkg/osmodifierlib/modifierutils.go

@@ -61,6 +61,49 @@ func doModifications(baseConfigPath string, osConfig *osmodifierapi.OS) error {
 		}
 	}
 
+	if osConfig.Verity != nil {
+
+		bootCustomizer, err := imagecustomizerlib.NewBootCustomizer(dummyChroot)
+		if err != nil {
+			return err
+		}
+
+		err = updateDefaultGrubForVerity(osConfig.Verity, bootCustomizer)
+		if err != nil {
+			return err
+		}
+
+		err = bootCustomizer.WriteToFile(dummyChroot)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func updateDefaultGrubForVerity(verity *imagecustomizerapi.Verity, bootCustomizer *imagecustomizerlib.BootCustomizer) error {
+
+	var err error
+
+	formattedCorruptionOption, err := imagecustomizerlib.SystemdFormatCorruptionOption(verity.CorruptionOption)
+	if err != nil {
+		return err
+	}
+
+	newArgs := []string{
+		"rd.systemd.verity=1",
+		fmt.Sprintf("systemd.verity_root_data=%s", verity.DataPartition.Id),
+		fmt.Sprintf("systemd.verity_root_hash=%s", verity.HashPartition.Id),
+		fmt.Sprintf("systemd.verity_root_options=%s", formattedCorruptionOption),
+	}
+
+	err = bootCustomizer.UpdateKernelCommandLineArgs("GRUB_CMDLINE_LINUX", []string{"rd.systemd.verity",
+		"systemd.verity_root_data", "systemd.verity_root_hash", "systemd.verity_root_options"}, newArgs)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 

toolkit/tools/pkg/osmodifierlib/modifydefaultgrub.go

@@ -14,12 +14,8 @@ import (
 
 var grubArgs = []string{
 	"rd.overlayfs",
-	"roothash",
 	"root",
-	"rd.systemd.verity",
-	"systemd.verity_root_data",
-	"systemd.verity_root_hash",
-	"systemd.verity_root_options",
+	"roothash",
 	"selinux",
 	"enforcing",
 }
@@ -92,6 +88,5 @@ func extractValuesFromGrubConfig(imageChroot safechroot.ChrootInterface) ([]stri
 			}
 		}
 	}
-
 	return values, rootDevice, nil
 }