b98eabeaed
This is intended as a minor fix for 1.12.1 so that task creation doesn't do unexpected things when the user supplies erroneous paths. In particular, because we're currently using hostConfig.Binds to setup mounts, if a user uses an absolute path for a volume mount source, or a non-absolute path for a bind mount source, the engine will do the opposite of what the user requested since all absolute paths are treated as binds and all non-absolute paths are treated as named volumes. Fixes #25253 Signed-off-by: Brian Goff <cpuguy83@gmail.com> Upstream-commit: 38f8b0eb10725c40fb3c7e0719accd240cd39e22 Component: engine
119 lines
3.0 KiB
Go
119 lines
3.0 KiB
Go
package container
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/daemon"
|
|
"github.com/docker/docker/pkg/stringid"
|
|
"github.com/docker/swarmkit/api"
|
|
)
|
|
|
|
func newTestControllerWithMount(m api.Mount) (*controller, error) {
|
|
return newController(&daemon.Daemon{}, &api.Task{
|
|
ID: stringid.GenerateRandomID(),
|
|
ServiceID: stringid.GenerateRandomID(),
|
|
Spec: api.TaskSpec{
|
|
Runtime: &api.TaskSpec_Container{
|
|
Container: &api.ContainerSpec{
|
|
Image: "image_name",
|
|
Labels: map[string]string{
|
|
"com.docker.swarm.task.id": "id",
|
|
},
|
|
Mounts: []api.Mount{m},
|
|
},
|
|
},
|
|
},
|
|
})
|
|
}
|
|
|
|
func TestControllerValidateMountBind(t *testing.T) {
|
|
// with improper source
|
|
if _, err := newTestControllerWithMount(api.Mount{
|
|
Type: api.MountTypeBind,
|
|
Source: "foo",
|
|
Target: testAbsPath,
|
|
}); err == nil || !strings.Contains(err.Error(), "invalid bind mount source") {
|
|
t.Fatalf("expected error, got: %v", err)
|
|
}
|
|
|
|
// with proper source
|
|
if _, err := newTestControllerWithMount(api.Mount{
|
|
Type: api.MountTypeBind,
|
|
Source: testAbsPath,
|
|
Target: testAbsPath,
|
|
}); err != nil {
|
|
t.Fatalf("expected error, got: %v", err)
|
|
}
|
|
}
|
|
|
|
func TestControllerValidateMountVolume(t *testing.T) {
|
|
// with improper source
|
|
if _, err := newTestControllerWithMount(api.Mount{
|
|
Type: api.MountTypeVolume,
|
|
Source: testAbsPath,
|
|
Target: testAbsPath,
|
|
}); err == nil || !strings.Contains(err.Error(), "invalid volume mount source") {
|
|
t.Fatalf("expected error, got: %v", err)
|
|
}
|
|
|
|
// with proper source
|
|
if _, err := newTestControllerWithMount(api.Mount{
|
|
Type: api.MountTypeVolume,
|
|
Source: "foo",
|
|
Target: testAbsPath,
|
|
}); err != nil {
|
|
t.Fatalf("expected error, got: %v", err)
|
|
}
|
|
}
|
|
|
|
func TestControllerValidateMountTarget(t *testing.T) {
|
|
// with improper target
|
|
if _, err := newTestControllerWithMount(api.Mount{
|
|
Type: api.MountTypeBind,
|
|
Source: testAbsPath,
|
|
Target: "foo",
|
|
}); err == nil || !strings.Contains(err.Error(), "invalid mount target") {
|
|
t.Fatalf("expected error, got: %v", err)
|
|
}
|
|
|
|
// with proper target
|
|
if _, err := newTestControllerWithMount(api.Mount{
|
|
Type: api.MountTypeBind,
|
|
Source: testAbsPath,
|
|
Target: testAbsPath,
|
|
}); err != nil {
|
|
t.Fatalf("expected no error, got: %v", err)
|
|
}
|
|
}
|
|
|
|
func TestControllerValidateMountTmpfs(t *testing.T) {
|
|
// with improper target
|
|
if _, err := newTestControllerWithMount(api.Mount{
|
|
Type: api.MountTypeTmpfs,
|
|
Source: "foo",
|
|
Target: testAbsPath,
|
|
}); err == nil || !strings.Contains(err.Error(), "invalid tmpfs source") {
|
|
t.Fatalf("expected error, got: %v", err)
|
|
}
|
|
|
|
// with proper target
|
|
if _, err := newTestControllerWithMount(api.Mount{
|
|
Type: api.MountTypeTmpfs,
|
|
Target: testAbsPath,
|
|
}); err != nil {
|
|
t.Fatalf("expected no error, got: %v", err)
|
|
}
|
|
}
|
|
|
|
func TestControllerValidateMountInvalidType(t *testing.T) {
|
|
// with improper target
|
|
if _, err := newTestControllerWithMount(api.Mount{
|
|
Type: api.Mount_MountType(9999),
|
|
Source: "foo",
|
|
Target: testAbsPath,
|
|
}); err == nil || !strings.Contains(err.Error(), "invalid mount type") {
|
|
t.Fatalf("expected error, got: %v", err)
|
|
}
|
|
}
|