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

feat(aa): add merge methods to the rule interface.

Browse source
This commit is contained in:
Alexandre Pujol 2024-06-22 20:59:43 +01:00
parent a91e2ddf56
commit 6791dcde28
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
14 changed files with 192 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkg/aa/file.go
View file

@ -132,11 +132,13 @@ func (r *File) Compare(other Rule) int {
func (r *File) Merge(other Rule) bool {
o, _ := other.(*File)
if r.Path == o.Path {
r.Access = append(r.Access, o.Access...)
slices.SortFunc(r.Access, compareFileAccess)
r.Access = slices.Compact(r.Access)
return true
if !r.Qualifier.Equal(o.Qualifier) {
return false
}
if r.Owner == o.Owner && r.Path == o.Path && r.Target == o.Target {
r.Access = merge(r.Kind(), "access", r.Access, o.Access)
return r.RuleBase.merge(o.RuleBase)
}
return false
}