Merge pull request #5134 from AkihiroSuda/dump-apparmor

crosbymichael · web-flow · commit da137a7a1fac · 2021-03-08T13:33:40.000-05:00
apparmor: add DumpDefaultProfile
diff --git a/contrib/apparmor/apparmor.go b/contrib/apparmor/apparmor.go
@@ -19,6 +19,7 @@
 package apparmor
 
 import (
+	"bytes"
 	"context"
 	"io/ioutil"
 	"os"
@@ -79,3 +80,17 @@ func LoadDefaultProfile(name string) error {
 	}
 	return nil
 }
+
+// DumpDefaultProfiles dumps the default profile with the given name.
+func DumpDefaultProfile(name string) (string, error) {
+	p, err := loadData(name)
+	if err != nil {
+		return "", err
+	}
+
+	var buf bytes.Buffer
+	if err := generate(p, &buf); err != nil {
+		return "", err
+	}
+	return buf.String(), nil
+}
diff --git a/contrib/apparmor/apparmor_test.go b/contrib/apparmor/apparmor_test.go
@@ -104,3 +104,16 @@ Copyright 2009-2018 Canonical Ltd.
 		}
 	}
 }
+
+func TestDumpDefaultProfile(t *testing.T) {
+	if _, err := getVersion(); err != nil {
+		t.Skipf("AppArmor not available: %+v", err)
+	}
+	name := "test-dump-default-profile"
+	prof, err := DumpDefaultProfile(name)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("Generated profile %q", name)
+	t.Log(prof)
+}

Original file line number	Diff line number	Diff line change
`@@ -104,3 +104,16 @@ Copyright 2009-2018 Canonical Ltd.`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`
	`107`	`+`
	`108`	`+func TestDumpDefaultProfile(t *testing.T) {`
	`109`	`+ if _, err := getVersion(); err != nil {`
	`110`	`+ t.Skipf("AppArmor not available: %+v", err)`
	`111`	`+ }`
	`112`	`+ name := "test-dump-default-profile"`
	`113`	`+ prof, err := DumpDefaultProfile(name)`
	`114`	`+ if err != nil {`
	`115`	`+ t.Fatal(err)`
	`116`	`+ }`
	`117`	`+ t.Logf("Generated profile %q", name)`
	`118`	`+ t.Log(prof)`
	`119`	`+}`