diff options
author | Sebastiaan van Stijn <thaJeztah@users.noreply.github.com> | 2020-12-22 13:23:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-22 13:23:36 +0100 |
commit | 4d6bc59f8102965258068facc2f064e69af0e688 (patch) | |
tree | a7b686879f55bd4631f0ddfbab46347819d9ccd7 | |
parent | aa1ada6b2a8d19775f47a63dd60c8edbe307eccb (diff) | |
parent | 1c5806cf57e008e6f3ef66e6c1c57c42bbd5d3aa (diff) | |
download | docker-4d6bc59f8102965258068facc2f064e69af0e688.tar.gz |
Merge pull request #41740 from EricMountain/dishonoured-capabilities-test
Dishonoured capabilities test
-rw-r--r-- | Dockerfile | 4 | ||||
-rw-r--r-- | Dockerfile.e2e | 4 | ||||
-rw-r--r-- | TESTING.md | 9 | ||||
-rw-r--r-- | integration-cli/docker_cli_daemon_test.go | 4 | ||||
-rw-r--r-- | integration-cli/docker_cli_network_unix_test.go | 2 | ||||
-rw-r--r-- | integration-cli/docker_cli_run_test.go | 6 | ||||
-rw-r--r-- | integration-cli/docker_cli_run_unix_test.go | 18 | ||||
-rw-r--r-- | integration-cli/fixtures_linux_daemon_test.go | 4 | ||||
-rw-r--r-- | integration/build/build_userns_linux_test.go | 140 | ||||
-rw-r--r-- | testutil/environment/environment.go | 21 | ||||
-rw-r--r-- | testutil/environment/protect.go | 2 |
11 files changed, 191 insertions, 23 deletions
diff --git a/Dockerfile b/Dockerfile index 672af8b878..c748a07492 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,10 +96,10 @@ RUN /download-frozen-image-v2.sh /build \ buildpack-deps:buster@sha256:d0abb4b1e5c664828b93e8b6ac84d10bce45ee469999bef88304be04a2709491 \ busybox:latest@sha256:95cf004f559831017cdf4628aaf1bb30133677be8702a8c5f2994629f637a209 \ busybox:glibc@sha256:1f81263701cddf6402afe9f33fca0266d9fff379e59b1748f33d3072da71ee85 \ - debian:buster@sha256:46d659005ca1151087efa997f1039ae45a7bf7a2cbbe2d17d3dcbda632a3ee9a \ + debian:bullseye@sha256:7190e972ab16aefea4d758ebe42a293f4e5c5be63595f4d03a5b9bf6839a4344 \ hello-world:latest@sha256:d58e752213a51785838f9eed2b7a498ffa1cb3aa7f946dda11af39286c3db9a9 \ arm32v7/hello-world:latest@sha256:50b8560ad574c779908da71f7ce370c0a2471c098d44d1c8f6b513c5a55eeeb1 -# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list) +# See also frozenImages in "testutil/environment/protect.go" (which needs to be updated when adding images to this list) FROM base AS cross-false diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 48dfb05c7e..b798c86175 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -21,9 +21,9 @@ RUN /download-frozen-image-v2.sh /build \ buildpack-deps:buster@sha256:d0abb4b1e5c664828b93e8b6ac84d10bce45ee469999bef88304be04a2709491 \ busybox:latest@sha256:95cf004f559831017cdf4628aaf1bb30133677be8702a8c5f2994629f637a209 \ busybox:glibc@sha256:1f81263701cddf6402afe9f33fca0266d9fff379e59b1748f33d3072da71ee85 \ - debian:buster@sha256:46d659005ca1151087efa997f1039ae45a7bf7a2cbbe2d17d3dcbda632a3ee9a \ + debian:bullseye@sha256:7190e972ab16aefea4d758ebe42a293f4e5c5be63595f4d03a5b9bf6839a4344 \ hello-world:latest@sha256:d58e752213a51785838f9eed2b7a498ffa1cb3aa7f946dda11af39286c3db9a9 -# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list) +# See also frozenImages in "testutil/environment/protect.go" (which needs to be updated when adding images to this list) FROM base AS dockercli ENV INSTALL_BINARY_NAME=dockercli diff --git a/TESTING.md b/TESTING.md index a1217ae0b4..fb0e4e9e6e 100644 --- a/TESTING.md +++ b/TESTING.md @@ -47,13 +47,20 @@ Bugs fixes should include a unit test case which exercises the bug. A bug fix may also include new assertions in existing integration tests for the API endpoint. +### Writing new integration tests + +Note the `integration-cli` tests are deprecated; new tests will be rejected by +the CI. + +Instead, implement new tests under `integration/`. + ### Integration tests environment considerations When adding new tests or modifying existing tests under `integration/`, testing environment should be properly considered. `skip.If` from [gotest.tools/skip](https://godoc.org/gotest.tools/skip) can be used to make the test run conditionally. Full testing environment conditions can be found at -[environment.go](https://github.com/moby/moby/blob/cb37987ee11655ed6bbef663d245e55922354c68/internal/test/environment/environment.go) +[environment.go](https://github.com/moby/moby/blob/6b6eeed03b963a27085ea670f40cd5ff8a61f32e/testutil/environment/environment.go) Here is a quick example. If the test needs to interact with a docker daemon on the same host, the following condition should be checked within the test code diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index 81bc7e605f..378b479dc8 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -1776,7 +1776,7 @@ func (s *DockerDaemonSuite) TestDaemonNoSpaceLeftOnDeviceError(c *testing.T) { defer mount.Unmount(testDir) // create a 3MiB image (with a 2MiB ext4 fs) and mount it as graph root - // Why in a container? Because `mount` sometimes behaves weirdly and often fails outright on this test in debian:buster (which is what the test suite runs under if run from the Makefile) + // Why in a container? Because `mount` sometimes behaves weirdly and often fails outright on this test in debian:bullseye (which is what the test suite runs under if run from the Makefile) dockerCmd(c, "run", "--rm", "-v", testDir+":/test", "busybox", "sh", "-c", "dd of=/test/testfs.img bs=1M seek=3 count=0") icmd.RunCommand("mkfs.ext4", "-F", filepath.Join(testDir, "testfs.img")).Assert(c, icmd.Success) @@ -1787,7 +1787,7 @@ func (s *DockerDaemonSuite) TestDaemonNoSpaceLeftOnDeviceError(c *testing.T) { defer s.d.Stop(c) // pull a repository large enough to overfill the mounted filesystem - pullOut, err := s.d.Cmd("pull", "debian:buster") + pullOut, err := s.d.Cmd("pull", "debian:bullseye") assert.Assert(c, err != nil, pullOut) assert.Assert(c, strings.Contains(pullOut, "no space left on device")) } diff --git a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go index b432133025..eb9d46b34d 100644 --- a/integration-cli/docker_cli_network_unix_test.go +++ b/integration-cli/docker_cli_network_unix_test.go @@ -1574,7 +1574,7 @@ func (s *DockerSuite) TestEmbeddedDNSInvalidInput(c *testing.T) { dockerCmd(c, "network", "create", "-d", "bridge", "nw1") // Sending garbage to embedded DNS shouldn't crash the daemon - dockerCmd(c, "run", "-i", "--net=nw1", "--name=c1", "debian:buster", "bash", "-c", "echo InvalidQuery > /dev/udp/127.0.0.11/53") + dockerCmd(c, "run", "-i", "--net=nw1", "--name=c1", "debian:bullseye", "bash", "-c", "echo InvalidQuery > /dev/udp/127.0.0.11/53") } func (s *DockerSuite) TestDockerNetworkConnectFailsNoInspectChange(c *testing.T) { diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index e0c1bbeb18..2fdc887188 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -2927,7 +2927,7 @@ func (s *DockerSuite) TestRunUnshareProc(c *testing.T) { go func() { name := "acidburn" - out, _, err := dockerCmdWithError("run", "--name", name, "--security-opt", "seccomp=unconfined", "debian:buster", "unshare", "-p", "-m", "-f", "-r", "--mount-proc=/proc", "mount") + out, _, err := dockerCmdWithError("run", "--name", name, "--security-opt", "seccomp=unconfined", "debian:bullseye", "unshare", "-p", "-m", "-f", "-r", "--mount-proc=/proc", "mount") if err == nil || !(strings.Contains(strings.ToLower(out), "permission denied") || strings.Contains(strings.ToLower(out), "operation not permitted")) { @@ -2939,7 +2939,7 @@ func (s *DockerSuite) TestRunUnshareProc(c *testing.T) { go func() { name := "cereal" - out, _, err := dockerCmdWithError("run", "--name", name, "--security-opt", "seccomp=unconfined", "debian:buster", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc") + out, _, err := dockerCmdWithError("run", "--name", name, "--security-opt", "seccomp=unconfined", "debian:bullseye", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc") if err == nil || !(strings.Contains(strings.ToLower(out), "mount: cannot mount none") || strings.Contains(strings.ToLower(out), "permission denied") || @@ -2953,7 +2953,7 @@ func (s *DockerSuite) TestRunUnshareProc(c *testing.T) { /* Ensure still fails if running privileged with the default policy */ go func() { name := "crashoverride" - out, _, err := dockerCmdWithError("run", "--privileged", "--security-opt", "seccomp=unconfined", "--security-opt", "apparmor=docker-default", "--name", name, "debian:buster", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc") + out, _, err := dockerCmdWithError("run", "--privileged", "--security-opt", "seccomp=unconfined", "--security-opt", "apparmor=docker-default", "--name", name, "debian:bullseye", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc") if err == nil || !(strings.Contains(strings.ToLower(out), "mount: cannot mount none") || strings.Contains(strings.ToLower(out), "permission denied") || diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go index a747f90ebd..44de2617d9 100644 --- a/integration-cli/docker_cli_run_unix_test.go +++ b/integration-cli/docker_cli_run_unix_test.go @@ -873,12 +873,12 @@ func (s *DockerSuite) TestRunTmpfsMountsWithOptions(c *testing.T) { assert.Assert(c, strings.Contains(out, option)) } - // We use debian:buster as there is no findmnt in busybox. Also the output will be in the format of + // We use debian:bullseye as there is no findmnt in busybox. Also the output will be in the format of // TARGET PROPAGATION // /tmp shared // so we only capture `shared` here. expectedOptions = []string{"shared"} - out, _ = dockerCmd(c, "run", "--tmpfs", "/tmp:shared", "debian:buster", "findmnt", "-o", "TARGET,PROPAGATION", "/tmp") + out, _ = dockerCmd(c, "run", "--tmpfs", "/tmp:shared", "debian:bullseye", "findmnt", "-o", "TARGET,PROPAGATION", "/tmp") for _, option := range expectedOptions { assert.Assert(c, strings.Contains(out, option)) } @@ -914,7 +914,7 @@ func (s *DockerSuite) TestRunSysctls(c *testing.T) { }) } -// TestRunSeccompProfileDenyUnshare checks that 'docker run --security-opt seccomp=/tmp/profile.json debian:buster unshare' exits with operation not permitted. +// TestRunSeccompProfileDenyUnshare checks that 'docker run --security-opt seccomp=/tmp/profile.json debian:bullseye unshare' exits with operation not permitted. func (s *DockerSuite) TestRunSeccompProfileDenyUnshare(c *testing.T) { testRequires(c, testEnv.IsLocalDaemon, seccompEnabled, NotArm, Apparmor) jsonData := `{ @@ -937,7 +937,7 @@ func (s *DockerSuite) TestRunSeccompProfileDenyUnshare(c *testing.T) { } icmd.RunCommand(dockerBinary, "run", "--security-opt", "apparmor=unconfined", "--security-opt", "seccomp="+tmpFile.Name(), - "debian:buster", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc").Assert(c, icmd.Expected{ + "debian:bullseye", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc").Assert(c, icmd.Expected{ ExitCode: 1, Err: "Operation not permitted", }) @@ -977,7 +977,7 @@ func (s *DockerSuite) TestRunSeccompProfileDenyChmod(c *testing.T) { }) } -// TestRunSeccompProfileDenyUnshareUserns checks that 'docker run debian:buster unshare --map-root-user --user sh -c whoami' with a specific profile to +// TestRunSeccompProfileDenyUnshareUserns checks that 'docker run debian:bullseye unshare --map-root-user --user sh -c whoami' with a specific profile to // deny unshare of a userns exits with operation not permitted. func (s *DockerSuite) TestRunSeccompProfileDenyUnshareUserns(c *testing.T) { testRequires(c, testEnv.IsLocalDaemon, seccompEnabled, NotArm, Apparmor) @@ -1009,7 +1009,7 @@ func (s *DockerSuite) TestRunSeccompProfileDenyUnshareUserns(c *testing.T) { } icmd.RunCommand(dockerBinary, "run", "--security-opt", "apparmor=unconfined", "--security-opt", "seccomp="+tmpFile.Name(), - "debian:buster", "unshare", "--map-root-user", "--user", "sh", "-c", "whoami").Assert(c, icmd.Expected{ + "debian:bullseye", "unshare", "--map-root-user", "--user", "sh", "-c", "whoami").Assert(c, icmd.Expected{ ExitCode: 1, Err: "Operation not permitted", }) @@ -1061,12 +1061,12 @@ func (s *DockerSuite) TestRunSeccompProfileAllow32Bit(c *testing.T) { icmd.RunCommand(dockerBinary, "run", "syscall-test", "exit32-test").Assert(c, icmd.Success) } -// TestRunSeccompAllowSetrlimit checks that 'docker run debian:buster ulimit -v 1048510' succeeds. +// TestRunSeccompAllowSetrlimit checks that 'docker run debian:bullseye ulimit -v 1048510' succeeds. func (s *DockerSuite) TestRunSeccompAllowSetrlimit(c *testing.T) { testRequires(c, testEnv.IsLocalDaemon, seccompEnabled) // ulimit uses setrlimit, so we want to make sure we don't break it - icmd.RunCommand(dockerBinary, "run", "debian:buster", "bash", "-c", "ulimit -v 1048510").Assert(c, icmd.Success) + icmd.RunCommand(dockerBinary, "run", "debian:bullseye", "bash", "-c", "ulimit -v 1048510").Assert(c, icmd.Success) } func (s *DockerSuite) TestRunSeccompDefaultProfileAcct(c *testing.T) { @@ -1362,7 +1362,7 @@ func (s *DockerSuite) TestRunApparmorProcDirectory(c *testing.T) { func (s *DockerSuite) TestRunSeccompWithDefaultProfile(c *testing.T) { testRequires(c, testEnv.IsLocalDaemon, seccompEnabled) - out, _, err := dockerCmdWithError("run", "--security-opt", "seccomp=../profiles/seccomp/default.json", "debian:buster", "unshare", "--map-root-user", "--user", "sh", "-c", "whoami") + out, _, err := dockerCmdWithError("run", "--security-opt", "seccomp=../profiles/seccomp/default.json", "debian:bullseye", "unshare", "--map-root-user", "--user", "sh", "-c", "whoami") assert.ErrorContains(c, err, "", out) assert.Equal(c, strings.TrimSpace(out), "unshare: unshare failed: Operation not permitted") } diff --git a/integration-cli/fixtures_linux_daemon_test.go b/integration-cli/fixtures_linux_daemon_test.go index f211a113da..acd593d300 100644 --- a/integration-cli/fixtures_linux_daemon_test.go +++ b/integration-cli/fixtures_linux_daemon_test.go @@ -49,7 +49,7 @@ func ensureSyscallTest(c *testing.T) { dockerFile := filepath.Join(tmp, "Dockerfile") content := []byte(` - FROM debian:buster + FROM debian:bullseye COPY . /usr/bin/ `) err = ioutil.WriteFile(dockerFile, content, 0600) @@ -103,7 +103,7 @@ func ensureNNPTest(c *testing.T) { dockerfile := filepath.Join(tmp, "Dockerfile") content := ` - FROM debian:buster + FROM debian:bullseye COPY . /usr/bin RUN chmod +s /usr/bin/nnp-test ` diff --git a/integration/build/build_userns_linux_test.go b/integration/build/build_userns_linux_test.go new file mode 100644 index 0000000000..5e0c4d40fb --- /dev/null +++ b/integration/build/build_userns_linux_test.go @@ -0,0 +1,140 @@ +package build // import "github.com/docker/docker/integration/build" + +import ( + "bufio" + "bytes" + "context" + "io" + "io/ioutil" + "os" + "strings" + "testing" + + "github.com/docker/docker/api/types" + "github.com/docker/docker/integration/internal/container" + "github.com/docker/docker/pkg/stdcopy" + "github.com/docker/docker/testutil/daemon" + "github.com/docker/docker/testutil/fakecontext" + "gotest.tools/v3/assert" + "gotest.tools/v3/skip" +) + +// Implements a test for https://github.com/moby/moby/issues/41723 +// Images built in a user-namespaced daemon should have capabilities serialised in +// VFS_CAP_REVISION_2 (no user-namespace root uid) format rather than V3 (that includes +// the root uid). +func TestBuildUserNamespaceValidateCapabilitiesAreV2(t *testing.T) { + skip.If(t, testEnv.DaemonInfo.OSType != "linux") + skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, !testEnv.IsUserNamespaceInKernel()) + skip.If(t, testEnv.IsRootless()) + + const imageTag = "capabilities:1.0" + + tmp, err := ioutil.TempDir("", "integration-") + assert.NilError(t, err) + defer os.RemoveAll(tmp) + + dUserRemap := daemon.New(t) + dUserRemap.StartWithBusybox(t, "--userns-remap", "default") + dUserRemapRunning := true + defer func() { + if dUserRemapRunning { + dUserRemap.Stop(t) + } + }() + + dockerfile := ` + FROM debian:bullseye + RUN setcap CAP_NET_BIND_SERVICE=+eip /bin/sleep + ` + + ctx := context.Background() + source := fakecontext.New(t, "", fakecontext.WithDockerfile(dockerfile)) + defer source.Close() + + clientUserRemap := dUserRemap.NewClientT(t) + resp, err := clientUserRemap.ImageBuild(ctx, + source.AsTarReader(t), + types.ImageBuildOptions{ + Tags: []string{imageTag}, + }) + assert.NilError(t, err) + defer resp.Body.Close() + buf := make([]byte, 1024) + for { + n, err := resp.Body.Read(buf) + if err != nil && err != io.EOF { + t.Fatalf("Error reading ImageBuild response: %v", err) + break + } + if n == 0 { + break + } + } + + reader, err := clientUserRemap.ImageSave(ctx, []string{imageTag}) + assert.NilError(t, err, "failed to download capabilities image") + defer reader.Close() + + tar, err := os.Create(tmp + "/image.tar") + assert.NilError(t, err, "failed to create image tar file") + defer tar.Close() + + _, err = io.Copy(tar, reader) + assert.NilError(t, err, "failed to write image tar file") + + dUserRemap.Stop(t) + dUserRemap.Cleanup(t) + dUserRemapRunning = false + + dNoUserRemap := daemon.New(t) + dNoUserRemap.StartWithBusybox(t) + defer dNoUserRemap.Stop(t) + + clientNoUserRemap := dNoUserRemap.NewClientT(t) + + tarFile, err := os.Open(tmp + "/image.tar") + assert.NilError(t, err, "failed to open image tar file") + + tarReader := bufio.NewReader(tarFile) + loadResp, err := clientNoUserRemap.ImageLoad(ctx, tarReader, false) + assert.NilError(t, err, "failed to load image tar file") + defer loadResp.Body.Close() + for { + n, err := loadResp.Body.Read(buf) + if err != nil && err != io.EOF { + t.Fatalf("Error reading ImageLoad response: %v", err) + break + } + if n == 0 { + break + } + } + + cid := container.Run(ctx, t, clientNoUserRemap, + container.WithImage(imageTag), + container.WithCmd("/sbin/getcap", "-n", "/bin/sleep"), + ) + logReader, err := clientNoUserRemap.ContainerLogs(ctx, cid, types.ContainerLogsOptions{ + ShowStdout: true, + }) + assert.NilError(t, err) + + actualStdout := new(bytes.Buffer) + actualStderr := ioutil.Discard + _, err = stdcopy.StdCopy(actualStdout, actualStderr, logReader) + assert.NilError(t, err) + if strings.TrimSpace(actualStdout.String()) != "/bin/sleep cap_net_bind_service=eip" { + // Activate when fix is merged: https://github.com/moby/moby/pull/41724 + //t.Fatalf("run produced invalid output: %q, expected %q", actualStdout.String(), "/bin/sleep cap_net_bind_service=eip") + // t.Logf("run produced invalid output (expected until #41724 merges): %q, expected %q", + // actualStdout.String(), + // "/bin/sleep cap_net_bind_service=eip") + } else { + // Shouldn't happen until fix is merged: https://github.com/moby/moby/pull/41724 + t.Fatalf("run produced valid output (unexpected until #41724 merges): %q, expected %q", + actualStdout.String(), + "/bin/sleep cap_net_bind_service=eip") + } +} diff --git a/testutil/environment/environment.go b/testutil/environment/environment.go index f8df37049d..23ab20451b 100644 --- a/testutil/environment/environment.go +++ b/testutil/environment/environment.go @@ -167,6 +167,27 @@ func (e *Execution) IsRootless() bool { return os.Getenv("DOCKER_ROOTLESS") != "" } +// IsUserNamespaceInKernel returns whether the kernel supports user namespaces +func (e *Execution) IsUserNamespaceInKernel() bool { + if _, err := os.Stat("/proc/self/uid_map"); os.IsNotExist(err) { + /* + * This kernel-provided file only exists if user namespaces are + * supported + */ + return false + } + + // We need extra check on redhat based distributions + if f, err := os.Open("/sys/module/user_namespace/parameters/enable"); err == nil { + defer f.Close() + b := make([]byte, 1) + _, _ = f.Read(b) + return string(b) != "N" + } + + return true +} + // HasExistingImage checks whether there is an image with the given reference. // Note that this is done by filtering and then checking whether there were any // results -- so ambiguous references might result in false-positives. diff --git a/testutil/environment/protect.go b/testutil/environment/protect.go index 282280e3f3..1ea0e43b66 100644 --- a/testutil/environment/protect.go +++ b/testutil/environment/protect.go @@ -10,7 +10,7 @@ import ( "gotest.tools/v3/assert" ) -var frozenImages = []string{"busybox:latest", "busybox:glibc", "hello-world:frozen", "debian:buster"} +var frozenImages = []string{"busybox:latest", "busybox:glibc", "hello-world:frozen", "debian:bullseye"} type protectedElements struct { containers map[string]struct{} |