Merge pull request #192 from Mashimiao/add-namespace-path-check

Mrunal Patel · web-flow · commit 4472a78eb2b3 · 2016-09-12T21:50:33.000-07:00
validation: add check for namespace path
diff --git a/cmd/ocitools/validate.go b/cmd/ocitools/validate.go
@@ -333,6 +333,13 @@ func checkLinux(spec rspec.Spec, rootfs string, hostCheck bool) (msgs []string)
 			} else if spec.Linux.Namespaces[index].Type == rspec.UserNamespace {
 				userExists = true
 			}
+		} else if hostCheck {
+			_, err := os.Stat(spec.Linux.Namespaces[index].Path)
+			if os.IsNotExist(err) {
+				msgs = append(msgs, fmt.Sprintf("Path of %v not exist", spec.Linux.Namespaces[index].Type))
+			} else if err != nil {
+				msgs = append(msgs, fmt.Sprintf("%v is invalid: %s", spec.Linux.Namespaces[index].Type, err.Error()))
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -333,6 +333,13 @@ func checkLinux(spec rspec.Spec, rootfs string, hostCheck bool) (msgs []string)`
`333`	`333`	`} else if spec.Linux.Namespaces[index].Type == rspec.UserNamespace {`
`334`	`334`	`userExists = true`
`335`	`335`	`}`
	`336`	`+ } else if hostCheck {`
	`337`	`+ _, err := os.Stat(spec.Linux.Namespaces[index].Path)`
	`338`	`+ if os.IsNotExist(err) {`
	`339`	`+ msgs = append(msgs, fmt.Sprintf("Path of %v not exist", spec.Linux.Namespaces[index].Type))`
	`340`	`+ } else if err != nil {`
	`341`	`+ msgs = append(msgs, fmt.Sprintf("%v is invalid: %s", spec.Linux.Namespaces[index].Type, err.Error()))`
	`342`	`+ }`
`336`	`343`	`}`
`337`	`344`	`}`
`338`	`345`