felipe/apparmor.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: update directive and prepare tasks to new structure.

Browse source
This commit is contained in:
Alexandre Pujol 2024-10-23 15:47:49 +01:00
parent 17cee26dc0
commit b614bdda36
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
8 changed files with 57 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkg/prebuild/directive/exec.go
View file

@ -8,10 +8,12 @@ package directive
import (
"fmt"
"path/filepath"
"slices"
"strings"
"github.com/roddhjav/apparmor.d/pkg/aa"
"github.com/roddhjav/apparmor.d/pkg/paths"
"github.com/roddhjav/apparmor.d/pkg/prebuild"
)
@ -43,7 +45,14 @@ func (d Exec) Apply(opt *Option, profileRaw string) (string, error) {
rules := aa.Rules{}
for name := range opt.ArgMap {
profiletoTransition := prebuild.RootApparmord.Join(name).MustReadFileAsString()
match, err := filepath.Glob(prebuild.Root.String() + "/*/" + name)
if err != nil {
return "", err
}
if len(match) != 1 {
return "", fmt.Errorf("No profile found for %s", name)
}
profiletoTransition := paths.New(match[0]).MustReadFileAsString()
dstProfile := aa.DefaultTunables()
if _, err := dstProfile.Parse(profiletoTransition); err != nil {
return "", err