-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ws-daemon] Internalize libcontainer/specconv because it got dropped …
…between runc 1.1.10 and 1.1.14
- Loading branch information
Showing
7 changed files
with
409 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # Why this package exists | ||
|
|
||
| The only reason this package exists is because libcontainer decided to privatize some functions we depend on in the specconv package. | ||
| It was easier to copy the files over than re-thinking everything we're doing here. |
240 changes: 240 additions & 0 deletions
240
components/ws-daemon/pkg/libcontainer/specconv/example.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,240 @@ | ||
| // Copyright The libcontainer authors | ||
|
|
||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
|
|
||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // Copied from: https://github.com/opencontainers/runc/blob/364ec0f1b4fa188ad96049c590ecb42fa70ea165/libcontainer/specconv/example.go#L1 | ||
| package specconv | ||
|
|
||
| import ( | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "github.com/opencontainers/runc/libcontainer/cgroups" | ||
| "github.com/opencontainers/runtime-spec/specs-go" | ||
| ) | ||
|
|
||
| // Example returns an example spec file, with many options set so a user can | ||
| // see what a standard spec file looks like. | ||
| func Example() *specs.Spec { | ||
| spec := &specs.Spec{ | ||
| Version: specs.Version, | ||
| Root: &specs.Root{ | ||
| Path: "rootfs", | ||
| Readonly: true, | ||
| }, | ||
| Process: &specs.Process{ | ||
| Terminal: true, | ||
| User: specs.User{}, | ||
| Args: []string{ | ||
| "sh", | ||
| }, | ||
| Env: []string{ | ||
| "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", | ||
| "TERM=xterm", | ||
| }, | ||
| Cwd: "/", | ||
| NoNewPrivileges: true, | ||
| Capabilities: &specs.LinuxCapabilities{ | ||
| Bounding: []string{ | ||
| "CAP_AUDIT_WRITE", | ||
| "CAP_KILL", | ||
| "CAP_NET_BIND_SERVICE", | ||
| }, | ||
| Permitted: []string{ | ||
| "CAP_AUDIT_WRITE", | ||
| "CAP_KILL", | ||
| "CAP_NET_BIND_SERVICE", | ||
| }, | ||
| Ambient: []string{ | ||
| "CAP_AUDIT_WRITE", | ||
| "CAP_KILL", | ||
| "CAP_NET_BIND_SERVICE", | ||
| }, | ||
| Effective: []string{ | ||
| "CAP_AUDIT_WRITE", | ||
| "CAP_KILL", | ||
| "CAP_NET_BIND_SERVICE", | ||
| }, | ||
| }, | ||
| Rlimits: []specs.POSIXRlimit{ | ||
| { | ||
| Type: "RLIMIT_NOFILE", | ||
| Hard: uint64(1024), | ||
| Soft: uint64(1024), | ||
| }, | ||
| }, | ||
| }, | ||
| Hostname: "runc", | ||
| Mounts: []specs.Mount{ | ||
| { | ||
| Destination: "/proc", | ||
| Type: "proc", | ||
| Source: "proc", | ||
| Options: nil, | ||
| }, | ||
| { | ||
| Destination: "/dev", | ||
| Type: "tmpfs", | ||
| Source: "tmpfs", | ||
| Options: []string{"nosuid", "strictatime", "mode=755", "size=65536k"}, | ||
| }, | ||
| { | ||
| Destination: "/dev/pts", | ||
| Type: "devpts", | ||
| Source: "devpts", | ||
| Options: []string{"nosuid", "noexec", "newinstance", "ptmxmode=0666", "mode=0620", "gid=5"}, | ||
| }, | ||
| { | ||
| Destination: "/dev/shm", | ||
| Type: "tmpfs", | ||
| Source: "shm", | ||
| Options: []string{"nosuid", "noexec", "nodev", "mode=1777", "size=65536k"}, | ||
| }, | ||
| { | ||
| Destination: "/dev/mqueue", | ||
| Type: "mqueue", | ||
| Source: "mqueue", | ||
| Options: []string{"nosuid", "noexec", "nodev"}, | ||
| }, | ||
| { | ||
| Destination: "/sys", | ||
| Type: "sysfs", | ||
| Source: "sysfs", | ||
| Options: []string{"nosuid", "noexec", "nodev", "ro"}, | ||
| }, | ||
| { | ||
| Destination: "/sys/fs/cgroup", | ||
| Type: "cgroup", | ||
| Source: "cgroup", | ||
| Options: []string{"nosuid", "noexec", "nodev", "relatime", "ro"}, | ||
| }, | ||
| }, | ||
| Linux: &specs.Linux{ | ||
| MaskedPaths: []string{ | ||
| "/proc/acpi", | ||
| "/proc/asound", | ||
| "/proc/kcore", | ||
| "/proc/keys", | ||
| "/proc/latency_stats", | ||
| "/proc/timer_list", | ||
| "/proc/timer_stats", | ||
| "/proc/sched_debug", | ||
| "/sys/firmware", | ||
| "/proc/scsi", | ||
| }, | ||
| ReadonlyPaths: []string{ | ||
| "/proc/bus", | ||
| "/proc/fs", | ||
| "/proc/irq", | ||
| "/proc/sys", | ||
| "/proc/sysrq-trigger", | ||
| }, | ||
| Resources: &specs.LinuxResources{ | ||
| Devices: []specs.LinuxDeviceCgroup{ | ||
| { | ||
| Allow: false, | ||
| Access: "rwm", | ||
| }, | ||
| }, | ||
| }, | ||
| Namespaces: []specs.LinuxNamespace{ | ||
| { | ||
| Type: specs.PIDNamespace, | ||
| }, | ||
| { | ||
| Type: specs.NetworkNamespace, | ||
| }, | ||
| { | ||
| Type: specs.IPCNamespace, | ||
| }, | ||
| { | ||
| Type: specs.UTSNamespace, | ||
| }, | ||
| { | ||
| Type: specs.MountNamespace, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| if cgroups.IsCgroup2UnifiedMode() { | ||
| spec.Linux.Namespaces = append(spec.Linux.Namespaces, specs.LinuxNamespace{ | ||
| Type: specs.CgroupNamespace, | ||
| }) | ||
| } | ||
| return spec | ||
| } | ||
|
|
||
| // ToRootless converts the given spec file into one that should work with | ||
| // rootless containers (euid != 0), by removing incompatible options and adding others that | ||
| // are needed. | ||
| func ToRootless(spec *specs.Spec) { | ||
| var namespaces []specs.LinuxNamespace | ||
|
|
||
| // Remove networkns from the spec. | ||
| for _, ns := range spec.Linux.Namespaces { | ||
| switch ns.Type { | ||
| case specs.NetworkNamespace, specs.UserNamespace: | ||
| // Do nothing. | ||
| default: | ||
| namespaces = append(namespaces, ns) | ||
| } | ||
| } | ||
| // Add userns to the spec. | ||
| namespaces = append(namespaces, specs.LinuxNamespace{ | ||
| Type: specs.UserNamespace, | ||
| }) | ||
| spec.Linux.Namespaces = namespaces | ||
|
|
||
| // Add mappings for the current user. | ||
| spec.Linux.UIDMappings = []specs.LinuxIDMapping{{ | ||
| HostID: uint32(os.Geteuid()), | ||
| ContainerID: 0, | ||
| Size: 1, | ||
| }} | ||
| spec.Linux.GIDMappings = []specs.LinuxIDMapping{{ | ||
| HostID: uint32(os.Getegid()), | ||
| ContainerID: 0, | ||
| Size: 1, | ||
| }} | ||
|
|
||
| // Fix up mounts. | ||
| var mounts []specs.Mount | ||
| for _, mount := range spec.Mounts { | ||
| // Replace the /sys mount with an rbind. | ||
| if filepath.Clean(mount.Destination) == "/sys" { | ||
| mounts = append(mounts, specs.Mount{ | ||
| Source: "/sys", | ||
| Destination: "/sys", | ||
| Type: "none", | ||
| Options: []string{"rbind", "nosuid", "noexec", "nodev", "ro"}, | ||
| }) | ||
| continue | ||
| } | ||
|
|
||
| // Remove all gid= and uid= mappings. | ||
| var options []string | ||
| for _, option := range mount.Options { | ||
| if !strings.HasPrefix(option, "gid=") && !strings.HasPrefix(option, "uid=") { | ||
| options = append(options, option) | ||
| } | ||
| } | ||
|
|
||
| mount.Options = options | ||
| mounts = append(mounts, mount) | ||
| } | ||
| spec.Mounts = mounts | ||
|
|
||
| // Remove cgroup settings. | ||
| spec.Linux.Resources = nil | ||
| } |
Oops, something went wrong.