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

feat(aa-log): format rule before print.

Browse source
This commit is contained in:
Alexandre Pujol 2023-10-01 19:00:39 +01:00
parent 352c444ae6
commit b99bb8da46
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
7 changed files with 73 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

25
pkg/aa/file.go
View file

@ -4,10 +4,6 @@
package aa
import (
"strings"
)
type File struct {
Qualifier
Path string
@ -26,28 +22,19 @@ func FileFromLog(log map[string]string) ApparmorRule {
func (r *File) Less(other any) bool {
o, _ := other.(*File)
letterR := ""
letterO := ""
for _, letter := range fileAlphabet {
if strings.HasPrefix(r.Path, letter) {
letterR = letter
}
if strings.HasPrefix(o.Path, letter) {
letterO = letter
}
}
letterR := getLetterIn(fileAlphabet, r.Path)
letterO := getLetterIn(fileAlphabet, o.Path)
if fileWeights[letterR] == fileWeights[letterO] || letterR == "" || letterO == "" {
if r.Path == o.Path {
if r.Qualifier.Equals(o.Qualifier) {
if r.Qualifier.Equals(o.Qualifier) {
if r.Path == o.Path {
if r.Access == o.Access {
return r.Target < o.Target
}
return r.Access < o.Access
}
return r.Qualifier.Less(o.Qualifier)
return r.Path < o.Path
}
return r.Path < o.Path
return r.Qualifier.Less(o.Qualifier)
}
return fileWeights[letterR] < fileWeights[letterO]
}