diff options
| author | Giuseppe Scrivano <giuseppe@scrivano.org> | 2022-03-24 17:02:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-24 17:02:20 +0100 |
| commit | ab8e15f6ac05a4f35604fa1b2c4f37765aae3007 (patch) | |
| tree | c7cb5c36cca79c25fa2806f9c11b93b86fd409e7 /test | |
| parent | a416fd6de40820e266e9e1e312c5f13bbb0b189f (diff) | |
| parent | aafa80918a245edcbdaceb1191d749570f1872d0 (diff) | |
| download | podman-ab8e15f6ac05a4f35604fa1b2c4f37765aae3007.tar.gz podman-ab8e15f6ac05a4f35604fa1b2c4f37765aae3007.tar.bz2 podman-ab8e15f6ac05a4f35604fa1b2c4f37765aae3007.zip | |
Merge pull request from GHSA-qvf8-p83w-v58j
do not set the inheritable capabilities
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/run_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 91a2eddad..f4a6e5733 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -498,7 +498,7 @@ var _ = Describe("Podman run", func() { session = podmanTest.Podman([]string{"run", "--rm", "--user", "root", ALPINE, "grep", "CapInh", "/proc/self/status"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(session.OutputToString()).To(ContainSubstring("00000000a80425fb")) + Expect(session.OutputToString()).To(ContainSubstring("0000000000000000")) session = podmanTest.Podman([]string{"run", "--rm", ALPINE, "grep", "CapBnd", "/proc/self/status"}) session.WaitWithDefaultTimeout() @@ -533,7 +533,7 @@ var _ = Describe("Podman run", func() { session = podmanTest.Podman([]string{"run", "--user=0:0", "--cap-add=DAC_OVERRIDE", "--rm", ALPINE, "grep", "CapInh", "/proc/self/status"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(session.OutputToString()).To(ContainSubstring("00000000a80425fb")) + Expect(session.OutputToString()).To(ContainSubstring("0000000000000000")) if os.Geteuid() > 0 { if os.Getenv("SKIP_USERNS") != "" { @@ -550,7 +550,7 @@ var _ = Describe("Podman run", func() { session = podmanTest.Podman([]string{"run", "--userns=keep-id", "--privileged", "--rm", ALPINE, "grep", "CapInh", "/proc/self/status"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(session.OutputToString()).To(ContainSubstring("0000000000000000")) + Expect(session.OutputToString()).To(ContainSubstring("0000000000000002")) session = podmanTest.Podman([]string{"run", "--userns=keep-id", "--cap-add=DAC_OVERRIDE", "--rm", ALPINE, "grep", "CapInh", "/proc/self/status"}) session.WaitWithDefaultTimeout() |