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

feat(aa): rule interface: replace less & equal by the compare method.

Browse source 
- set a new alphabet order to sort AARE based string.
- unify compare function for all rules
- handle some special sort order, eg: base include
This commit is contained in:
Alexandre Pujol 2024-06-19 18:34:58 +01:00
parent 747292e954
commit 4cbacc186c
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
22 changed files with 250 additions and 399 deletions
Download patch file Download diff file Expand all files Collapse all files

17
pkg/aa/rlimit.go
View file

@ -43,20 +43,15 @@ func (r *Rlimit) Validate() error {
return nil
}
func (r *Rlimit) Less(other any) bool {
func (r *Rlimit) Compare(other Rule) int {
o, _ := other.(*Rlimit)
if r.Key != o.Key {
return r.Key < o.Key
if res := compare(r.Key, o.Key); res != 0 {
return res
}
if r.Op != o.Op {
return r.Op < o.Op
if res := compare(r.Op, o.Op); res != 0 {
return res
}
return r.Value < o.Value
}
func (r *Rlimit) Equals(other any) bool {
o, _ := other.(*Rlimit)
return r.Key == o.Key && r.Op == o.Op && r.Value == o.Value
return compare(r.Value, o.Value)
}
func (r *Rlimit) String() string {