Skip to content

just check hostname with UTS namespace when platform set as linux #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrunalp merged 1 commit into from
Jun 1, 2016
Merged

just check hostname with UTS namespace when platform set as linux #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func bundleValidate(spec rspec.Spec, rootfs string, hooksCheck bool) {
checkSemVer(spec.Version)
checkPlatform(spec.Platform)
checkProcess(spec.Process, rootfs)
checkLinux(spec.Linux, spec.Hostname, rootfs)
checkLinux(spec)
checkHooks(spec.Hooks, hooksCheck)
}

Expand Down Expand Up @@ -182,39 +182,39 @@ func checkProcess(process rspec.Process, rootfs string) {
}

//Linux only
func checkLinux(spec rspec.Linux, hostname string, rootfs string) {
func checkLinux(spec rspec.Spec) {
utsExists := false

if len(spec.UIDMappings) > 5 {
if len(spec.Linux.UIDMappings) > 5 {
logrus.Fatalf("Only 5 UID mappings are allowed (linux kernel restriction).")
}
if len(spec.GIDMappings) > 5 {
if len(spec.Linux.GIDMappings) > 5 {
logrus.Fatalf("Only 5 GID mappings are allowed (linux kernel restriction).")
}

for index := 0; index < len(spec.Namespaces); index++ {
if !namespaceValid(spec.Namespaces[index]) {
logrus.Fatalf("namespace %v is invalid.", spec.Namespaces[index])
} else if spec.Namespaces[index].Type == rspec.UTSNamespace {
for index := 0; index < len(spec.Linux.Namespaces); index++ {
if !namespaceValid(spec.Linux.Namespaces[index]) {
logrus.Fatalf("namespace %v is invalid.", spec.Linux.Namespaces[index])
} else if spec.Linux.Namespaces[index].Type == rspec.UTSNamespace {
utsExists = true
}
}

if !utsExists && hostname != "" {
logrus.Fatalf("Hostname requires a new UTS namespace to be specified as well")
if spec.Platform.OS == "linux" && !utsExists && spec.Hostname != "" {
logrus.Fatalf("On Linux, hostname requires a new UTS namespace to be specified as well")
}

for index := 0; index < len(spec.Devices); index++ {
if !deviceValid(spec.Devices[index]) {
logrus.Fatalf("device %v is invalid.", spec.Devices[index])
for index := 0; index < len(spec.Linux.Devices); index++ {
if !deviceValid(spec.Linux.Devices[index]) {
logrus.Fatalf("device %v is invalid.", spec.Linux.Devices[index])
}
}

if spec.Seccomp != nil {
checkSeccomp(*spec.Seccomp)
if spec.Linux.Seccomp != nil {
checkSeccomp(*spec.Linux.Seccomp)
}

switch spec.RootfsPropagation {
switch spec.Linux.RootfsPropagation {
case "":
case "private":
case "rprivate":
Expand Down