Merge pull request #1150 from WeiZhang555/forbid-duplicated-namespace

Detect and forbid duplicated namespace in spec
This commit is contained in:
Qiang Huang 2016-10-27 10:23:16 +08:00 committed by GitHub
commit e7abf30cb8
2 changed files with 27 additions and 0 deletions

View File

@ -187,6 +187,9 @@ func CreateLibcontainerConfig(opts *CreateOpts) (*configs.Config, error) {
if !exists { if !exists {
return nil, fmt.Errorf("namespace %q does not exist", ns) return nil, fmt.Errorf("namespace %q does not exist", ns)
} }
if config.Namespaces.Contains(t) {
return nil, fmt.Errorf("malformed spec file: duplicated ns %q", ns)
}
config.Namespaces.Add(t, ns.Path) config.Namespaces.Add(t, ns.Path)
} }
if config.Namespaces.Contains(configs.NEWNET) { if config.Namespaces.Contains(configs.NEWNET) {

View File

@ -38,3 +38,27 @@ func TestLinuxCgroupsPathNotSpecified(t *testing.T) {
t.Errorf("Wrong cgroupsPath, expected it to be empty string, got '%s'", cgroup.Path) t.Errorf("Wrong cgroupsPath, expected it to be empty string, got '%s'", cgroup.Path)
} }
} }
func TestDupNamespaces(t *testing.T) {
spec := &specs.Spec{
Linux: &specs.Linux{
Namespaces: []specs.Namespace{
{
Type: "pid",
},
{
Type: "pid",
Path: "/proc/1/ns/pid",
},
},
},
}
_, err := CreateLibcontainerConfig(&CreateOpts{
Spec: spec,
})
if err == nil {
t.Errorf("Duplicated namespaces should be forbidden")
}
}