actions: run: Check script exists during recipe verification

.github/workflows/ci.yaml

@@ -166,6 +166,8 @@ jobs:
             test: { name: "arch", case: "arch" }
           - backend: kvm
             test: { name: "apertis", case: "apertis" }
+          - backend: kvm
+            test: { name: "run", case: "run" }
     name: ${{matrix.test.name}} on ${{matrix.backend}}
     runs-on: 'ubuntu-latest'
     steps:

actions/run_action.go

@@ -45,6 +45,8 @@ package actions
 import (
 	"errors"
 	"github.com/go-debos/fakemachine"
+	"fmt"
+	"os"
 	"path"
 	"strings"
 
@@ -62,6 +64,9 @@ type RunAction struct {
 	Script           string
 	Command          string
 	Label            string
+
+	scriptPath       string
+	scriptArgs       []string
 }
 
 func (run *RunAction) Verify(context *debos.DebosContext) error {
@@ -72,6 +77,29 @@ func (run *RunAction) Verify(context *debos.DebosContext) error {
 	if run.Script == "" && run.Command == "" {
 		return errors.New("Script and Command both cannot be empty")
 	}
+
+	if run.Script != "" {
+		/* Extract the full script path from the arguments */
+		args := strings.Split(run.Script, " ")
+		run.scriptPath = debos.CleanPathAt(args[0], context.RecipeDir)
+		run.scriptArgs = args[1:]
+
+		/* Check the script exists on the filesystem (following symlinks) */
+		stat, err := os.Stat(run.scriptPath)
+		if err != nil {
+			return err
+		}
+
+		if stat.IsDir() {
+			return fmt.Errorf("script %s is a directory", run.Script)
+		}
+
+		/* Check the script is executable */
+		if stat.Mode()&0111 == 0 {
+			return fmt.Errorf("script %s is not executable", run.Script)
+		}
+	}
+
 	return nil
 }
 
@@ -82,12 +110,8 @@ func (run *RunAction) PreMachine(context *debos.DebosContext, m *fakemachine.Mac
 		return nil
 	}
 
-	run.Script = debos.CleanPathAt(run.Script, context.RecipeDir)
-	// Expect we have no blank spaces in path
-	scriptpath := strings.Split(run.Script, " ")
-
 	if !run.PostProcess {
-		m.AddVolume(path.Dir(scriptpath[0]))
+		m.AddVolume(path.Dir(run.scriptPath))
 	}
 
 	return nil
@@ -105,15 +129,14 @@ func (run *RunAction) doRun(context debos.DebosContext) error {
 	}
 
 	if run.Script != "" {
-		script := strings.SplitN(run.Script, " ", 2)
-		script[0] = debos.CleanPathAt(script[0], context.RecipeDir)
 		if run.Chroot {
-			scriptpath := path.Dir(script[0])
-			cmd.AddBindMount(scriptpath, "/tmp/script")
-			script[0] = strings.Replace(script[0], scriptpath, "/tmp/script", 1)
+			scriptDir := path.Dir(run.scriptPath)
+			cmd.AddBindMount(scriptDir, "/tmp/script")
+			run.scriptPath = strings.Replace(run.scriptPath, scriptDir, "/tmp/script", 1)
 		}
-		cmdline = []string{strings.Join(script, " ")}
-		label = path.Base(run.Script)
+		cmdline = []string{run.scriptPath}
+		cmdline = append(cmdline, run.scriptArgs...)
+		label = path.Base(run.scriptPath)
 	} else {
 		cmdline = []string{run.Command}
 
@@ -140,7 +163,7 @@ func (run *RunAction) doRun(context debos.DebosContext) error {
 	}
 
 	// Command/script with options passed as single string
-	cmdline = append([]string{"sh", "-c"}, cmdline...)
+	cmdline = append([]string{"sh", "-c"}, strings.Join(cmdline, " "))
 
 	if !run.Chroot {
 		cmd.AddEnvKey("RECIPEDIR", context.RecipeDir)

tests/run/scripts/test-broken-symlink.sh

@@ -0,0 +1 @@
+broken.sh

tests/run/scripts/test-symlink.sh

@@ -0,0 +1 @@
+test.sh

tests/run/scripts/test.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "test from script; arguments: $@"

tests/run/test.yaml

@@ -0,0 +1,46 @@
+---
+architecture: amd64
+
+actions:
+  - action: debootstrap
+    suite: bullseye
+    variant: minbase
+    merged-usr: true
+
+  - action: run
+    description: Run a script which is a symlink
+    script: scripts/test-symlink.sh argument1 argument2
+
+  - action: run
+    description: Run a script with arguments
+    script: scripts/test.sh argument1 argument2
+
+  - action: run
+    description: Run a script without arguments
+    script: scripts/test.sh
+
+  - action: run
+    description: Run a script with arguments in a chroot
+    chroot: true
+    script: scripts/test.sh argument1 argument2
+
+  - action: run
+    description: Run a script without arguments in chroot
+    chroot: true
+    script: scripts/test.sh
+
+  - action: run
+    description: Test running a command
+    command: echo test
+
+  # TODO: This should fail in the Verify stage, we cannot yet check that in CI
+  #- action: run
+  #  description: Run a script which has a broken symlink
+  #  chroot: true
+  #  script: scripts/test-broken-symlink.sh
+
+  # TODO: This should fail in the Verify stage, we cannot yet check that in CI
+  #- action: run
+  #  description: Run a script which has no exec bit set
+  #  chroot: true
+  #  script: scripts/test-broken-symlink.sh