Merge pull request #185 from openSUSE/aa-profiles

Fix AppArmor profile prefix and name

common/pkg/apparmor/apparmor.go

@@ -2,14 +2,16 @@ package apparmor
 
 import (
 	"errors"
+
+	"github.com/containers/common/pkg/version"
 )
 
 const (
 	// ProfilePrefix is used for version-independent presence checks.
-	ProfilePrefix = "apparmor_profile"
+	ProfilePrefix = "containers-default-"
 
 	// Profile default name
-	Profile = "container-default"
+	Profile = ProfilePrefix + version.Version
 )
 
 var (

common/pkg/apparmor/apparmor_linux.go

@@ -255,9 +255,11 @@ func CheckProfileAndLoadDefault(name string) (string, error) {
 		}
 	}
 
-	// If the specified name is not empty or is not a default libpod one,
+	if name == "" {
-	// ignore it and return the name.
+		name = Profile
-	if name != "" && !strings.HasPrefix(name, ProfilePrefix) {
+	} else if !strings.HasPrefix(name, ProfilePrefix) {
+		// If the specified name is not a default one, ignore it and return the
+		// name.
 		isLoaded, err := IsLoaded(name)
 		if err != nil {
 			return "", err
@@ -268,7 +270,6 @@ func CheckProfileAndLoadDefault(name string) (string, error) {
 		return name, nil
 	}
 
-	name = Profile
 	// To avoid expensive redundant loads on each invocation, check
 	// if it's loaded before installing it.
 	isLoaded, err := IsLoaded(name)

common/pkg/config/config_test.go

@@ -5,6 +5,7 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/containers/common/pkg/apparmor"
 	"github.com/containers/common/pkg/capabilities"
 	. "github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
@@ -22,7 +23,7 @@ var _ = Describe("Config", func() {
 
 			// Then
 			gomega.Expect(err).To(gomega.BeNil())
-			gomega.Expect(defaultConfig.Containers.ApparmorProfile).To(gomega.Equal("container-default"))
+			gomega.Expect(defaultConfig.Containers.ApparmorProfile).To(gomega.Equal(apparmor.Profile))
 			gomega.Expect(defaultConfig.Containers.PidsLimit).To(gomega.BeEquivalentTo(2048))
 		})
 
@@ -235,7 +236,7 @@ var _ = Describe("Config", func() {
 			config, err := NewConfig("")
 			// Then
 			gomega.Expect(err).To(gomega.BeNil())
-			gomega.Expect(config.Containers.ApparmorProfile).To(gomega.Equal("container-default"))
+			gomega.Expect(config.Containers.ApparmorProfile).To(gomega.Equal(apparmor.Profile))
 			gomega.Expect(config.Containers.PidsLimit).To(gomega.BeEquivalentTo(2048))
 			gomega.Expect(config.Containers.Env).To(gomega.BeEquivalentTo(envs))
 			gomega.Expect(config.Network.CNIPluginDirs).To(gomega.Equal(pluginDirs))

common/pkg/version/version.go

@@ -0,0 +1,4 @@
+package version
+
+// Version is the version of the build.
+const Version = "0.15.0-dev"