660b9962e4
Commitdae652e2e5
added support for non-privileged containers to use ICMP_PROTO (used for `ping`). This option cannot be set for containers that have user-namespaces enabled. However, the detection looks to be incorrect; HostConfig.UsernsMode was added in6993e891d1
/ee2183881b
, and the property only has meaning if the daemon is running with user namespaces enabled. In other situations, the property has no meaning. As a result of the above, the sysctl would only be set for containers running with UsernsMode=host on a daemon running with user-namespaces enabled. This patch adds a check if the daemon has user-namespaces enabled (RemappedRoot having a non-empty value), or if the daemon is running inside a user namespace (e.g. rootless mode) to fix the detection. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commita826ca3aef
) --- The cherry-pick was almost clean but `userns.RunningInUserNS()` -> `sys.RunningInUserNS()`. Fix docker/buildx issue 561 --- Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
205 lines
6.4 KiB
Go
205 lines
6.4 KiB
Go
package daemon // import "github.com/docker/docker/daemon"
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
containertypes "github.com/docker/docker/api/types/container"
|
|
"github.com/docker/docker/container"
|
|
"github.com/docker/docker/daemon/config"
|
|
"github.com/docker/docker/daemon/network"
|
|
"github.com/docker/docker/pkg/containerfs"
|
|
"github.com/docker/docker/pkg/idtools"
|
|
"github.com/docker/libnetwork"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
"gotest.tools/v3/skip"
|
|
)
|
|
|
|
func setupFakeDaemon(t *testing.T, c *container.Container) *Daemon {
|
|
root, err := ioutil.TempDir("", "oci_linux_test-root")
|
|
assert.NilError(t, err)
|
|
|
|
rootfs := filepath.Join(root, "rootfs")
|
|
err = os.MkdirAll(rootfs, 0755)
|
|
assert.NilError(t, err)
|
|
|
|
netController, err := libnetwork.New()
|
|
assert.NilError(t, err)
|
|
|
|
d := &Daemon{
|
|
// some empty structs to avoid getting a panic
|
|
// caused by a null pointer dereference
|
|
idMapping: &idtools.IdentityMapping{},
|
|
configStore: &config.Config{},
|
|
linkIndex: newLinkIndex(),
|
|
netController: netController,
|
|
}
|
|
|
|
c.Root = root
|
|
c.BaseFS = containerfs.NewLocalContainerFS(rootfs)
|
|
|
|
if c.Config == nil {
|
|
c.Config = new(containertypes.Config)
|
|
}
|
|
if c.HostConfig == nil {
|
|
c.HostConfig = new(containertypes.HostConfig)
|
|
}
|
|
if c.NetworkSettings == nil {
|
|
c.NetworkSettings = &network.Settings{Networks: make(map[string]*network.EndpointSettings)}
|
|
}
|
|
|
|
return d
|
|
}
|
|
|
|
func cleanupFakeContainer(c *container.Container) {
|
|
_ = os.RemoveAll(c.Root)
|
|
}
|
|
|
|
// TestTmpfsDevShmNoDupMount checks that a user-specified /dev/shm tmpfs
|
|
// mount (as in "docker run --tmpfs /dev/shm:rw,size=NNN") does not result
|
|
// in "Duplicate mount point" error from the engine.
|
|
// https://github.com/moby/moby/issues/35455
|
|
func TestTmpfsDevShmNoDupMount(t *testing.T) {
|
|
skip.If(t, os.Getuid() != 0, "skipping test that requires root")
|
|
c := &container.Container{
|
|
ShmPath: "foobar", // non-empty, for c.IpcMounts() to work
|
|
HostConfig: &containertypes.HostConfig{
|
|
IpcMode: containertypes.IpcMode("shareable"), // default mode
|
|
// --tmpfs /dev/shm:rw,exec,size=NNN
|
|
Tmpfs: map[string]string{
|
|
"/dev/shm": "rw,exec,size=1g",
|
|
},
|
|
},
|
|
}
|
|
d := setupFakeDaemon(t, c)
|
|
defer cleanupFakeContainer(c)
|
|
|
|
_, err := d.createSpec(c)
|
|
assert.Check(t, err)
|
|
}
|
|
|
|
// TestIpcPrivateVsReadonly checks that in case of IpcMode: private
|
|
// and ReadonlyRootfs: true (as in "docker run --ipc private --read-only")
|
|
// the resulting /dev/shm mount is NOT made read-only.
|
|
// https://github.com/moby/moby/issues/36503
|
|
func TestIpcPrivateVsReadonly(t *testing.T) {
|
|
skip.If(t, os.Getuid() != 0, "skipping test that requires root")
|
|
c := &container.Container{
|
|
HostConfig: &containertypes.HostConfig{
|
|
IpcMode: containertypes.IpcMode("private"),
|
|
ReadonlyRootfs: true,
|
|
},
|
|
}
|
|
d := setupFakeDaemon(t, c)
|
|
defer cleanupFakeContainer(c)
|
|
|
|
s, err := d.createSpec(c)
|
|
assert.Check(t, err)
|
|
|
|
// Find the /dev/shm mount in ms, check it does not have ro
|
|
for _, m := range s.Mounts {
|
|
if m.Destination != "/dev/shm" {
|
|
continue
|
|
}
|
|
assert.Check(t, is.Equal(false, inSlice(m.Options, "ro")))
|
|
}
|
|
}
|
|
|
|
// TestSysctlOverride ensures that any implicit sysctls (such as
|
|
// Config.Domainname) are overridden by an explicit sysctl in the HostConfig.
|
|
func TestSysctlOverride(t *testing.T) {
|
|
skip.If(t, os.Getuid() != 0, "skipping test that requires root")
|
|
c := &container.Container{
|
|
Config: &containertypes.Config{
|
|
Hostname: "foobar",
|
|
Domainname: "baz.cyphar.com",
|
|
},
|
|
HostConfig: &containertypes.HostConfig{
|
|
NetworkMode: "bridge",
|
|
Sysctls: map[string]string{},
|
|
},
|
|
}
|
|
d := setupFakeDaemon(t, c)
|
|
defer cleanupFakeContainer(c)
|
|
|
|
// Ensure that the implicit sysctl is set correctly.
|
|
s, err := d.createSpec(c)
|
|
assert.NilError(t, err)
|
|
assert.Equal(t, s.Hostname, "foobar")
|
|
assert.Equal(t, s.Linux.Sysctl["kernel.domainname"], c.Config.Domainname)
|
|
if sysctlExists("net.ipv4.ip_unprivileged_port_start") {
|
|
assert.Equal(t, s.Linux.Sysctl["net.ipv4.ip_unprivileged_port_start"], "0")
|
|
}
|
|
if sysctlExists("net.ipv4.ping_group_range") {
|
|
assert.Equal(t, s.Linux.Sysctl["net.ipv4.ping_group_range"], "0 2147483647")
|
|
}
|
|
|
|
// Set an explicit sysctl.
|
|
c.HostConfig.Sysctls["kernel.domainname"] = "foobar.net"
|
|
assert.Assert(t, c.HostConfig.Sysctls["kernel.domainname"] != c.Config.Domainname)
|
|
c.HostConfig.Sysctls["net.ipv4.ip_unprivileged_port_start"] = "1024"
|
|
|
|
s, err = d.createSpec(c)
|
|
assert.NilError(t, err)
|
|
assert.Equal(t, s.Hostname, "foobar")
|
|
assert.Equal(t, s.Linux.Sysctl["kernel.domainname"], c.HostConfig.Sysctls["kernel.domainname"])
|
|
assert.Equal(t, s.Linux.Sysctl["net.ipv4.ip_unprivileged_port_start"], c.HostConfig.Sysctls["net.ipv4.ip_unprivileged_port_start"])
|
|
|
|
// Ensure the ping_group_range is not set on a daemon with user-namespaces enabled
|
|
d.configStore.RemappedRoot = "dummy:dummy"
|
|
s, err = d.createSpec(c)
|
|
assert.NilError(t, err)
|
|
_, ok := s.Linux.Sysctl["net.ipv4.ping_group_range"]
|
|
assert.Assert(t, !ok)
|
|
|
|
// Ensure the ping_group_range is set on a container in "host" userns mode
|
|
// on a daemon with user-namespaces enabled
|
|
c.HostConfig.UsernsMode = "host"
|
|
s, err = d.createSpec(c)
|
|
assert.NilError(t, err)
|
|
assert.Equal(t, s.Linux.Sysctl["net.ipv4.ping_group_range"], "0 2147483647")
|
|
}
|
|
|
|
// TestSysctlOverrideHost ensures that any implicit network sysctls are not set
|
|
// with host networking
|
|
func TestSysctlOverrideHost(t *testing.T) {
|
|
skip.If(t, os.Getuid() != 0, "skipping test that requires root")
|
|
c := &container.Container{
|
|
Config: &containertypes.Config{},
|
|
HostConfig: &containertypes.HostConfig{
|
|
NetworkMode: "host",
|
|
Sysctls: map[string]string{},
|
|
},
|
|
}
|
|
d := setupFakeDaemon(t, c)
|
|
defer cleanupFakeContainer(c)
|
|
|
|
// Ensure that the implicit sysctl is not set
|
|
s, err := d.createSpec(c)
|
|
assert.NilError(t, err)
|
|
assert.Equal(t, s.Linux.Sysctl["net.ipv4.ip_unprivileged_port_start"], "")
|
|
assert.Equal(t, s.Linux.Sysctl["net.ipv4.ping_group_range"], "")
|
|
|
|
// Set an explicit sysctl.
|
|
c.HostConfig.Sysctls["net.ipv4.ip_unprivileged_port_start"] = "1024"
|
|
|
|
s, err = d.createSpec(c)
|
|
assert.NilError(t, err)
|
|
assert.Equal(t, s.Linux.Sysctl["net.ipv4.ip_unprivileged_port_start"], c.HostConfig.Sysctls["net.ipv4.ip_unprivileged_port_start"])
|
|
}
|
|
|
|
func TestGetSourceMount(t *testing.T) {
|
|
// must be able to find source mount for /
|
|
mnt, _, err := getSourceMount("/")
|
|
assert.NilError(t, err)
|
|
assert.Equal(t, mnt, "/")
|
|
|
|
// must be able to find source mount for current directory
|
|
cwd, err := os.Getwd()
|
|
assert.NilError(t, err)
|
|
_, _, err = getSourceMount(cwd)
|
|
assert.NilError(t, err)
|
|
}
|