Fix lint and new uki steps (#274)

* Fix lint and add new uki step

Make it simpler by dividing the actual base mounts and pivot into new
sysroot into two different steps

Signed-off-by: Itxaka <itxaka@kairos.io>

* Fix constant name and gosec issues

Signed-off-by: Itxaka <itxaka@kairos.io>

---------

Signed-off-by: Itxaka <itxaka@kairos.io>

internal/constants/constants.go

@@ -88,6 +88,7 @@ const (
 	OpSentinel             = "create-sentinel"
 	OpUkiUdev              = "uki-udev"
 	OpUkiBaseMounts        = "uki-base-mounts"
+	OpUkiPivotToSysroot    = "uki-pivot-to-sysroot"
 	OpUkiKernelModules     = "uki-kernel-modules"
 	OpWaitForSysroot       = "wait-for-sysroot"
 	OpLvmActivate          = "lvm-activation"
@@ -105,4 +106,6 @@ const (
 	UkiSysrootDir          = "sysroot"
 	PersistentStateTarget  = "/usr/local/.state"
 	LogDir                 = "/run/immucore"
+	PathAppend             = "/usr/bin:/usr/sbin:/bin:/sbin"
+	PATH                   = "PATH"
 )

internal/utils/common.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/avast/retry-go"
 	"github.com/joho/godotenv"
+	"github.com/kairos-io/immucore/internal/constants"
 	"github.com/kairos-io/kairos-sdk/state"
 )
 
@@ -219,15 +220,15 @@ func CommandWithPath(c string) (string, error) {
 func PrepareCommandWithPath(c string) *exec.Cmd {
 	cmd := exec.Command("/bin/sh", "-c", c)
 	cmd.Env = os.Environ()
-	pathAppend := "/usr/bin:/usr/sbin:/bin:/sbin"
+	pathAppend := constants.PathAppend
 	// try to extract any existing path from the environment
 	for _, env := range cmd.Env {
 		splitted := strings.Split(env, "=")
-		if splitted[0] == "PATH" {
+		if splitted[0] == constants.PATH {
 			pathAppend = fmt.Sprintf("%s:%s", pathAppend, splitted[1])
 		}
 	}
-	cmd.Env = append(cmd.Env, fmt.Sprintf("PATH=%s", pathAppend))
+	cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", constants.PATH, pathAppend))
 	return cmd
 }
 
@@ -243,15 +244,15 @@ func GetHostProcCmdline() string {
 
 func DropToEmergencyShell() {
 	env := os.Environ()
-	pathAppend := "/usr/bin:/usr/sbin:/bin:/sbin"
 	// try to extract any existing path from the environment
+	pathAppend := constants.PathAppend
 	for _, e := range env {
 		splitted := strings.Split(e, "=")
-		if splitted[0] == "PATH" {
+		if splitted[0] == constants.PATH {
 			pathAppend = fmt.Sprintf("%s:%s", pathAppend, splitted[1])
 		}
 	}
-	env = append(env, fmt.Sprintf("PATH=%s", pathAppend))
+	env = append(env, fmt.Sprintf("%s=%s", constants.PATH, pathAppend))
 	if err := syscall.Exec("/bin/bash", []string{"/bin/bash"}, env); err != nil {
 		if err := syscall.Exec("/bin/sh", []string{"/bin/sh"}, env); err != nil {
 			if err := syscall.Exec("/sysroot/bin/bash", []string{"/sysroot/bin/bash"}, env); err != nil {

pkg/dag/dag_uki_boot.go

@@ -15,6 +15,9 @@ func RegisterUKI(s *state.State, g *herd.Graph) error {
 	// Mount basic mounts
 	s.LogIfError(s.UKIMountBaseSystem(g), "mounting base mounts")
 
+	// Move to sysroot
+	s.LogIfError(s.UkiPivotToSysroot(g), "pivot to sysroot")
+
 	// Write sentinel
 	s.LogIfError(s.WriteSentinelDagStep(g, cnst.OpUkiBaseMounts), "sentinel")
 

pkg/state/steps_uki.go

@@ -4,13 +4,13 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/foxboron/go-uefi/efi"
 	"os"
 	"path/filepath"
 	"strings"
 	"syscall"
 	"time"
 
+	"github.com/foxboron/go-uefi/efi"
 	"github.com/hashicorp/go-multierror"
 	cnst "github.com/kairos-io/immucore/internal/constants"
 	internalUtils "github.com/kairos-io/immucore/internal/utils"
@@ -42,8 +42,7 @@ func (s *State) UKIMountBaseSystem(g *herd.Graph) error {
 		herd.WithCallback(
 			func(_ context.Context) error {
 				var err error
-				// Now continue with the new root dir as usual
+				// Mount base mounts
-
 				mounts := []mount{
 					{
 						"/sys",
@@ -154,10 +153,24 @@ func (s *State) UKIMountBaseSystem(g *herd.Graph) error {
 				if !efi.GetSecureBoot() && len(internalUtils.ReadCMDLineArg("rd.immucore.securebootdisabled")) == 0 {
 					internalUtils.Log.Panic().Msg("Secure boot is not enabled")
 				}
+				return err
+			},
+		),
+	)
+}
+
+// UkiPivotToSysroot moves the rootfs to the sysroot and chroots into it
+// Making the /sysroot the new rootfs with a tmpfs fs
+// And moving all the mounts into it and all the files as well.
+func (s *State) UkiPivotToSysroot(g *herd.Graph) error {
+	return g.Add(cnst.OpUkiPivotToSysroot,
+		herd.WithDeps(cnst.OpUkiBaseMounts),
+		herd.WithCallback(func(_ context.Context) error {
+			var err error
 			// Create the new sysroot and move to it
 			// We need the sysroot to NOT be of type rootfs, otherwise kubernetes stuff doesnt really work
 			internalUtils.Log.Debug().Str("what", s.path(cnst.UkiSysrootDir)).Msg("Creating sysroot dir")
-				err = os.MkdirAll(s.path(cnst.UkiSysrootDir), 0755)
+			err = os.MkdirAll(s.path(cnst.UkiSysrootDir), 0755) // #nosec G301 -- Sysroot needs to be 755 to be world readable
 			if err != nil {
 				internalUtils.Log.Err(err).Msg("creating sysroot dir")
 				internalUtils.DropToEmergencyShell()
@@ -196,7 +209,7 @@ func (s *State) UKIMountBaseSystem(g *herd.Graph) error {
 					// If the directory has the same device as its parent, it's not a mount point.
 					if fileInfo.Sys().(*syscall.Stat_t).Dev == parentInfo.Sys().(*syscall.Stat_t).Dev {
 						internalUtils.Log.Debug().Str("what", path).Msg("simple directory")
-							err = os.MkdirAll(filepath.Join(s.path(cnst.UkiSysrootDir), path), 0755)
+						err = os.MkdirAll(filepath.Join(s.path(cnst.UkiSysrootDir), path), fileInfo.Mode())
 						if err != nil {
 							internalUtils.Log.Err(err).Str("what", filepath.Join(s.path(cnst.UkiSysrootDir), path)).Msg("mkdir")
 							return err
@@ -244,8 +257,8 @@ func (s *State) UKIMountBaseSystem(g *herd.Graph) error {
 			// Now move the system mounts into the new dir
 			for _, d := range mountPoints {
 				newDir := filepath.Join(s.path(cnst.UkiSysrootDir), d)
-					if _, err := os.Stat(newDir); err != nil {
+				if dirStat, err := os.Stat(newDir); err != nil {
-						err = os.MkdirAll(newDir, 0755)
+					err = os.MkdirAll(newDir, dirStat.Mode())
 					if err != nil {
 						internalUtils.Log.Err(err).Str("what", newDir).Msg("mkdir")
 					}
@@ -282,7 +295,8 @@ func (s *State) UKIMountBaseSystem(g *herd.Graph) error {
 				internalUtils.Log.Err(pcrErr).Msg("running systemd-pcrphase")
 				internalUtils.Log.Debug().Str("out", output).Msg("systemd-pcrphase enter-initrd")
 			}
-				pcrErr = os.MkdirAll("/run/systemd", 0755)
+
+			pcrErr = os.MkdirAll("/run/systemd", 0755) // #nosec G301 -- Original dir has this permissions
 			if pcrErr != nil {
 				internalUtils.Log.Err(pcrErr).Msg("Creating /run/systemd dir")
 			}
@@ -294,16 +308,14 @@ func (s *State) UKIMountBaseSystem(g *herd.Graph) error {
 				internalUtils.Log.Err(pcrErr).Str("out", out).Msg("Copying extra files")
 			}
 			return err
-			},
+		}))
-		),
-	)
 }
 
 // UKIUdevDaemon launches the udevd daemon and triggers+settles in order to discover devices
 // Needed if we expect to find devices by label...
 func (s *State) UKIUdevDaemon(g *herd.Graph) error {
 	return g.Add(cnst.OpUkiUdev,
-		herd.WithDeps(cnst.OpUkiBaseMounts, cnst.OpUkiKernelModules),
+		herd.WithDeps(cnst.OpUkiBaseMounts, cnst.OpUkiPivotToSysroot, cnst.OpUkiKernelModules),
 		herd.WithCallback(func(_ context.Context) error {
 			// Should probably figure out other udevd binaries....
 			var udevBin string
@@ -340,7 +352,7 @@ func (s *State) UKIUdevDaemon(g *herd.Graph) error {
 // probably others down the line.
 func (s *State) UKILoadKernelModules(g *herd.Graph) error {
 	return g.Add(cnst.OpUkiKernelModules,
-		herd.WithDeps(cnst.OpUkiBaseMounts),
+		herd.WithDeps(cnst.OpUkiBaseMounts, cnst.OpUkiPivotToSysroot),
 		herd.WithCallback(func(_ context.Context) error {
 			drivers, err := kdetect.ProbeKernelModules("")
 			if err != nil {