Merge pull request #18921 from fangpenlin/fix-18907-set-correct-cwd-f…

…or-poststop-hook-exe Fixes #18907, pass in correct cwd value for hooks exe
containers · Jun 28, 2023 · f739f8f · f739f8f
2 parents 4dc2e08 + dd81f7a
commit f739f8f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
@@ -2094,7 +2094,17 @@ func (c *Container) postDeleteHooks(ctx context.Context) error {
 				hook := hook
 				logrus.Debugf("container %s: invoke poststop hook %d, path %s", c.ID(), i, hook.Path)
 				var stderr, stdout bytes.Buffer
-				hookErr, err := exec.Run(ctx, &hook, state, &stdout, &stderr, exec.DefaultPostKillTimeout) //nolint:staticcheck
+				hookErr, err := exec.RunWithOptions(
+					ctx,
+					exec.RunOptions{
+						Hook:            &hook,
+						Dir:             c.bundlePath(),
+						State:           state,
+						Stdout:          &stdout,
+						Stderr:          &stderr,
+						PostKillTimeout: exec.DefaultPostKillTimeout,
+					},
+				)
 				if err != nil {
 					logrus.Warnf("Container %s: poststop hook %d: %v", c.ID(), i, err)
 					if hookErr != err {
@@ -2223,7 +2233,15 @@ func (c *Container) setupOCIHooks(ctx context.Context, config *spec.Spec) (map[s
 		}
 	}
 
-	hookErr, err := exec.RuntimeConfigFilter(ctx, allHooks["precreate"], config, exec.DefaultPostKillTimeout) //nolint:staticcheck
+	hookErr, err := exec.RuntimeConfigFilterWithOptions(
+		ctx,
+		exec.RuntimeConfigFilterOptions{
+			Hooks:           allHooks["precreate"],
+			Dir:             c.bundlePath(),
+			Config:          config,
+			PostKillTimeout: exec.DefaultPostKillTimeout,
+		},
+	)
 	if err != nil {
 		logrus.Warnf("Container %s: precreate hook: %v", c.ID(), err)
 		if hookErr != nil && hookErr != err {

diff --git a/libpod/container_internal_test.go b/libpod/container_internal_test.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"testing"
 
 	"github.com/containers/storage/pkg/idtools"
@@ -142,6 +143,7 @@ func TestPostDeleteHooks(t *testing.T) {
 
 	statePath := filepath.Join(dir, "state")
 	copyPath := filepath.Join(dir, "copy")
+	cwdPath := filepath.Join(dir, "cwd")
 	c := Container{
 		runtime: &Runtime{},
 		config: &ContainerConfig{
@@ -169,6 +171,10 @@ func TestPostDeleteHooks(t *testing.T) {
 						Path: hookPath,
 						Args: []string{"sh", "-c", fmt.Sprintf("cp %s %s", statePath, copyPath)},
 					},
+					rspec.Hook{
+						Path: hookPath,
+						Args: []string{"sh", "-c", fmt.Sprintf("pwd >%s", cwdPath)},
+					},
 				},
 			},
 		},
@@ -188,6 +194,11 @@ func TestPostDeleteHooks(t *testing.T) {
 			assert.Regexp(t, stateRegexp, string(content))
 		})
 	}
+	content, err := os.ReadFile(cwdPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, strings.TrimSuffix(string(content), "\n"), dir)
 }
 
 func init() {