Skip to content

Commit

Permalink
Merge pull request #44942 from vvoland/apparmor-check-binary-23
Browse files Browse the repository at this point in the history
[23.0 backport] apparmor: Check if apparmor_parser is available
  • Loading branch information
thaJeztah committed Feb 7, 2023
2 parents a25ab92 + 38b70eb commit e664cc2
Showing 1 changed file with 22 additions and 1 deletion.
23 changes: 22 additions & 1 deletion daemon/apparmor_default.go
Expand Up @@ -5,9 +5,12 @@ package daemon // import "github.com/docker/docker/daemon"

import (
"fmt"
"os"
"sync"

"github.com/containerd/containerd/pkg/apparmor"
aaprofile "github.com/docker/docker/profiles/apparmor"
"github.com/sirupsen/logrus"
)

// Define constants for native driver
Expand All @@ -16,6 +19,11 @@ const (
defaultAppArmorProfile = "docker-default"
)

var (
checkAppArmorOnce sync.Once
isAppArmorAvailable bool
)

// DefaultApparmorProfile returns the name of the default apparmor profile
func DefaultApparmorProfile() string {
if apparmor.HostSupports() {
Expand All @@ -25,7 +33,20 @@ func DefaultApparmorProfile() string {
}

func ensureDefaultAppArmorProfile() error {
if apparmor.HostSupports() {
checkAppArmorOnce.Do(func() {
if apparmor.HostSupports() {
// Restore the apparmor_parser check removed in containerd:
// https://github.com/containerd/containerd/commit/1acca8bba36e99684ee3489ea4a42609194ca6b9
// Fixes: https://github.com/moby/moby/issues/44900
if _, err := os.Stat("/sbin/apparmor_parser"); err == nil {
isAppArmorAvailable = true
} else {
logrus.Warn("AppArmor enabled on system but \"apparmor_parser\" binary is missing, so profile can't be loaded")
}
}
})

if isAppArmorAvailable {
loaded, err := aaprofile.IsLoaded(defaultAppArmorProfile)
if err != nil {
return fmt.Errorf("Could not check if %s AppArmor profile was loaded: %s", defaultAppArmorProfile, err)
Expand Down

0 comments on commit e664cc2

Please sign in to comment.