Create working dir after setupRepo and setupFiles

Author: un-def

runner/internal/executor/executor.go

@@ -196,7 +196,7 @@ func (ex *RunExecutor) Run(ctx context.Context) (err error) {
 
 	ex.setJobCredentials(ctx)
 
-	if err := ex.prepareJobWorkingDir(ctx); err != nil {
+	if err := ex.setJobWorkingDir(ctx); err != nil {
 		ex.SetJobStateWithTerminationReason(
 			ctx,
 			types.JobStateFailed,
@@ -352,7 +352,7 @@ func (ex *RunExecutor) setJobCredentials(ctx context.Context) {
 	log.Trace(ctx, "Job credentials", "uid", ex.jobUid, "gid", ex.jobGid, "home", ex.jobHomeDir)
 }
 
-func (ex *RunExecutor) prepareJobWorkingDir(ctx context.Context) error {
+func (ex *RunExecutor) setJobWorkingDir(ctx context.Context) error {
 	var err error
 	if ex.jobSpec.WorkingDir == nil {
 		ex.jobWorkingDir, err = os.Getwd()
@@ -372,9 +372,6 @@ func (ex *RunExecutor) prepareJobWorkingDir(ctx context.Context) error {
 		}
 	}
 	log.Trace(ctx, "Job working dir", "path", ex.jobWorkingDir)
-	if err := common.MkdirAll(ctx, ex.jobWorkingDir, ex.jobUid, ex.jobGid); err != nil {
-		return fmt.Errorf("create working directory: %w", err)
-	}
 	return nil
 }
 
@@ -429,6 +426,9 @@ func (ex *RunExecutor) execJob(ctx context.Context, jobLogFile io.Writer) error
 	}
 	cmd.WaitDelay = ex.killDelay // kills the process if it doesn't exit in time
 
+	if err := common.MkdirAll(ctx, ex.jobWorkingDir, ex.jobUid, ex.jobGid); err != nil {
+		return fmt.Errorf("create working directory: %w", err)
+	}
 	cmd.Dir = ex.jobWorkingDir
 
 	// User must be already set

runner/internal/executor/executor_test.go

@@ -28,7 +28,7 @@ func TestExecutor_WorkingDir_Set(t *testing.T) {
 
 	ex.jobSpec.WorkingDir = &workingDir
 	ex.jobSpec.Commands = append(ex.jobSpec.Commands, "pwd")
-	err = ex.prepareJobWorkingDir(context.TODO())
+	err = ex.setJobWorkingDir(context.TODO())
 	require.NoError(t, err)
 	require.Equal(t, workingDir, ex.jobWorkingDir)
 	err = os.MkdirAll(workingDir, 0o755)
@@ -47,7 +47,7 @@ func TestExecutor_WorkingDir_NotSet(t *testing.T) {
 	require.NoError(t, err)
 	ex.jobSpec.WorkingDir = nil
 	ex.jobSpec.Commands = append(ex.jobSpec.Commands, "pwd")
-	err = ex.prepareJobWorkingDir(context.TODO())
+	err = ex.setJobWorkingDir(context.TODO())
 	require.NoError(t, err)
 	require.Equal(t, cwd, ex.jobWorkingDir)
 
@@ -158,7 +158,7 @@ func TestExecutor_RemoteRepo(t *testing.T) {
 	err := os.WriteFile(ex.codePath, []byte{}, 0o600) // empty diff
 	require.NoError(t, err)
 
-	err = ex.prepareJobWorkingDir(context.TODO())
+	err = ex.setJobWorkingDir(context.TODO())
 	require.NoError(t, err)
 	err = ex.setupRepo(context.TODO())
 	require.NoError(t, err)
@@ -211,6 +211,7 @@ func makeTestExecutor(t *testing.T) *RunExecutor {
 	ex, _ := NewRunExecutor(temp, home, 10022)
 	ex.SetJob(body)
 	ex.SetCodePath(filepath.Join(baseDir, "code")) // note: create file before run
+	ex.setJobWorkingDir(context.Background())
 	return ex
 }
 

runner/internal/executor/files.go

@@ -2,10 +2,12 @@ package executor
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"os"
 	"path"
+	"path/filepath"
 	"regexp"
 
 	"github.com/codeclysm/extract/v4"
@@ -32,7 +34,14 @@ func (ex *RunExecutor) AddFileArchive(id string, src io.Reader) error {
 }
 
 // setupFiles must be called from Run
+// ex.jobWorkingDir must be already set
 func (ex *RunExecutor) setupFiles(ctx context.Context) error {
+	if ex.jobWorkingDir == "" {
+		return errors.New("setup files: working dir is not set")
+	}
+	if !filepath.IsAbs(ex.jobWorkingDir) {
+		return fmt.Errorf("setup files: working dir must be absolute: %s", ex.jobWorkingDir)
+	}
 	for _, fa := range ex.jobSpec.FileArchives {
 		archivePath := path.Join(ex.archiveDir, fa.Id)
 		if err := extractFileArchive(ctx, archivePath, fa.Path, ex.jobWorkingDir, ex.jobUid, ex.jobGid, ex.jobHomeDir); err != nil {
@@ -53,9 +62,6 @@ func extractFileArchive(ctx context.Context, archivePath string, destPath string
 		return fmt.Errorf("expand destination path: %w", err)
 	}
 	destBase, destName := path.Split(destPath)
-	if destBase == "" {
-		destBase = "."
-	}
 	if err := common.MkdirAll(ctx, destBase, uid, gid); err != nil {
 		return fmt.Errorf("create destination directory: %w", err)
 	}

runner/internal/executor/repo.go

@@ -15,8 +15,15 @@ import (
 )
 
 // setupRepo must be called from Run
+// ex.jobWorkingDir must be already set
 // TODO: change ownership to uid:gid
 func (ex *RunExecutor) setupRepo(ctx context.Context) error {
+	if ex.jobWorkingDir == "" {
+		return errors.New("setup repo: working dir is not set")
+	}
+	if !filepath.IsAbs(ex.jobWorkingDir) {
+		return fmt.Errorf("setup repo: working dir must be absolute: %s", ex.jobWorkingDir)
+	}
 	if ex.jobSpec.RepoDir == nil {
 		return errors.New("repo_dir is not set")
 	}