opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-18 07:28:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6280 from mheon/switch_off_noexec

Browse Source 
Turn off 'noexec' option by default for named volumes
This commit is contained in:
OpenShift Merge Robot
2020-05-21 16:26:20 +02:00
committed by GitHub
parent 8b49d10550 cc65430145
commit 835d2644b8
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/util/mountOpts_linux.go
View File

@ -7,7 +7,7 @@ import (
) )
func getDefaultMountOptions(path string) (defaultMountOptions, error) { func getDefaultMountOptions(path string) (defaultMountOptions, error) {
opts := defaultMountOptions{true, true, true} opts := defaultMountOptions{false, true, true}
if path == "" { if path == "" {
return opts, nil return opts, nil
} }

2
test/e2e/create_test.go
View File

@ -207,7 +207,7 @@ var _ = Describe("Podman create", func() {
session = podmanTest.Podman([]string{"logs", "test_tmpfs"}) session = podmanTest.Podman([]string{"logs", "test_tmpfs"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
Expect(session.OutputToString()).To(ContainSubstring("/create/test rw,nosuid,nodev,noexec,relatime - tmpfs")) Expect(session.OutputToString()).To(ContainSubstring("/create/test rw,nosuid,nodev,relatime - tmpfs"))
}) })
It("podman create --pod automatically", func() { It("podman create --pod automatically", func() {

2
test/e2e/run_volume_test.go
View File

@ -117,7 +117,7 @@ var _ = Describe("Podman run with volumes", func() {
session = podmanTest.Podman([]string{"run", "--rm", "--mount", "type=tmpfs,target=" + dest, ALPINE, "grep", dest, "/proc/self/mountinfo"}) session = podmanTest.Podman([]string{"run", "--rm", "--mount", "type=tmpfs,target=" + dest, ALPINE, "grep", dest, "/proc/self/mountinfo"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
Expect(session.OutputToString()).To(ContainSubstring(dest + " rw,nosuid,nodev,noexec,relatime - tmpfs")) Expect(session.OutputToString()).To(ContainSubstring(dest + " rw,nosuid,nodev,relatime - tmpfs"))
session = podmanTest.Podman([]string{"run", "--rm", "--mount", "type=tmpfs,target=/etc/ssl,tmpcopyup", ALPINE, "ls", "/etc/ssl"}) session = podmanTest.Podman([]string{"run", "--rm", "--mount", "type=tmpfs,target=/etc/ssl,tmpcopyup", ALPINE, "ls", "/etc/ssl"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()

11
test/system/160-volumes.bats
View File

@ -115,7 +115,8 @@ echo "got here -$rand-"
EOF EOF
chmod 755 $mountpoint/myscript chmod 755 $mountpoint/myscript
# By default, volumes are mounted noexec. This should fail. # By default, volumes are mounted exec, but we have manually added the
# noexec option. This should fail.
# ARGH. Unfortunately, runc (used for cgroups v1) produces a different error # ARGH. Unfortunately, runc (used for cgroups v1) produces a different error
local expect_rc=126 local expect_rc=126
local expect_msg='.* OCI runtime permission denied.*' local expect_msg='.* OCI runtime permission denied.*'
@ -125,12 +126,12 @@ EOF
expect_msg='.* exec user process caused.*permission denied' expect_msg='.* exec user process caused.*permission denied'
fi fi
run_podman ${expect_rc} run --rm --volume $myvolume:/vol:z $IMAGE /vol/myscript run_podman ${expect_rc} run --rm --volume $myvolume:/vol:noexec,z $IMAGE /vol/myscript
is "$output" "$expect_msg" "run on volume, noexec" is "$output" "$expect_msg" "run on volume, noexec"
# With exec, it should pass # With the default, it should pass
run_podman run --rm -v $myvolume:/vol:z,exec $IMAGE /vol/myscript run_podman run --rm -v $myvolume:/vol:z $IMAGE /vol/myscript
is "$output" "got here -$rand-" "script in volume is runnable with exec" is "$output" "got here -$rand-" "script in volume is runnable with default (exec)"
# Clean up # Clean up
run_podman volume rm $myvolume run_podman volume rm $myvolume