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

17
pkg/aa/signal.go
View file

@ -77,6 +77,23 @@ func (r *Signal) Validate() error {
return nil
}
func (r *Signal) Merge(other Rule) bool {
o, _ := other.(*Signal)
if !r.Qualifier.Equal(o.Qualifier) {
return false
}
switch {
case r.Peer == o.Peer && compare(r.Set, o.Set) == 0:
r.Access = merge(r.Kind(), "access", r.Access, o.Access)
return r.RuleBase.merge(o.RuleBase)
case r.Peer == o.Peer && compare(r.Access, o.Access) == 0:
r.Set = merge(r.Kind(), "set", r.Set, o.Set)
return r.RuleBase.merge(o.RuleBase)
}
return false
}
func (r *Signal) Compare(other Rule) int {
o, _ := other.(*Signal)
if res := compare(r.Access, o.Access); res != 0 {