Skip to content
This repository has been archived by the owner on Feb 1, 2020. It is now read-only.

Commit

Permalink
Error if container requires AppArmor, SELinux or seccomp
Browse files Browse the repository at this point in the history
Closes google#35

PiperOrigin-RevId: 195840128
Change-Id: I31c1ad9b51ec53abb6f0b485d35622d4e9764b29
  • Loading branch information
fvoznika authored and shentubot committed May 8, 2018
1 parent fea624b commit e1b412d
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 0 deletions.
19 changes: 19 additions & 0 deletions runsc/sandbox/sandbox.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,22 @@ func validateID(id string) error {
return nil
}

func validateSpec(spec *specs.Spec) error {
if spec.Process.SelinuxLabel != "" {
return fmt.Errorf("SELinux is not supported: %s", spec.Process.SelinuxLabel)
}

// Docker uses AppArmor by default, so just log that it's being ignored.
if spec.Process.ApparmorProfile != "" {
log.Warningf("AppArmor profile %q is being ignored", spec.Process.ApparmorProfile)
}
// TODO: Apply seccomp to application inside sandbox.
if spec.Linux != nil && spec.Linux.Seccomp != nil {
log.Warningf("Seccomp spec is being ignored")
}
return nil
}

// Sandbox wraps a child sandbox process, and is responsible for saving and
// loading sandbox metadata to disk.
//
Expand Down Expand Up @@ -110,6 +126,9 @@ func Create(id string, spec *specs.Spec, conf *boot.Config, bundleDir, consoleSo
if err := validateID(id); err != nil {
return nil, err
}
if err := validateSpec(spec); err != nil {
return nil, err
}

sandboxRoot := filepath.Join(conf.RootDir, id)
if exists(sandboxRoot) {
Expand Down
22 changes: 22 additions & 0 deletions runsc/sandbox/sandbox_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,28 @@ func TestConsoleSocket(t *testing.T) {
}
}

func TestSpecUnsupported(t *testing.T) {
spec := newSpecWithArgs("/bin/true")
spec.Process.SelinuxLabel = "somelabel"

// These are normally set by docker and will just cause warnings to be logged.
spec.Process.ApparmorProfile = "someprofile"
spec.Linux = &specs.Linux{Seccomp: &specs.LinuxSeccomp{}}

rootDir, bundleDir, conf, err := setupSandbox(spec)
if err != nil {
t.Fatalf("error setting up sandbox: %v", err)
}
defer os.RemoveAll(rootDir)
defer os.RemoveAll(bundleDir)

id := uniqueSandboxID()
_, err = sandbox.Create(id, spec, conf, bundleDir, "", "", nil)
if err == nil || !strings.Contains(err.Error(), "is not supported") {
t.Errorf("sandbox.Create() wrong error, got: %v, want: *is not supported, spec.Process: %+v", err, spec.Process)
}
}

// procListsEqual is used to check whether 2 Process lists are equal for all
// implemented fields.
func procListsEqual(got, want []*control.Process) bool {
Expand Down

0 comments on commit e1b412d

Please sign in to comment.