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

22
pkg/aa/change_profile.go
View file

@ -39,24 +39,18 @@ func (r *ChangeProfile) Validate() error {
return nil
}
func (r *ChangeProfile) Less(other any) bool {
func (r *ChangeProfile) Compare(other Rule) int {
o, _ := other.(*ChangeProfile)
if r.ExecMode != o.ExecMode {
return r.ExecMode < o.ExecMode
if res := compare(r.ExecMode, o.ExecMode); res != 0 {
return res
}
if r.Exec != o.Exec {
return r.Exec < o.Exec
if res := compare(r.Exec, o.Exec); res != 0 {
return res
}
if r.ProfileName != o.ProfileName {
return r.ProfileName < o.ProfileName
if res := compare(r.ProfileName, o.ProfileName); res != 0 {
return res
}
return r.Qualifier.Less(o.Qualifier)
}
func (r *ChangeProfile) Equals(other any) bool {
o, _ := other.(*ChangeProfile)
return r.ExecMode == o.ExecMode && r.Exec == o.Exec &&
r.ProfileName == o.ProfileName && r.Qualifier.Equals(o.Qualifier)
return r.Qualifier.Compare(o.Qualifier)
}
func (r *ChangeProfile) String() string {