mirrors/apparmor.d
1
0
Fork 0
mirror of https://github.com/roddhjav/apparmor.d.git synced 2024-11-15 07:54:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(aa): sort local include at the end of a profile.

Browse Source
This commit is contained in:
Alexandre Pujol 2023-09-29 21:24:15 +01:00
parent bd4e9bb135
commit 26d05f1869
No known key found for this signature in database
GPG Key ID: C5469996F0DF68EC
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/aa/profile.go
View File

@ -128,6 +128,12 @@ func (p *AppArmorProfile) Sort() {
if typeOfI != typeOfJ {
valueOfI := typeToValue(typeOfI)
valueOfJ := typeToValue(typeOfJ)
if typeOfI == reflect.TypeOf((*Include)(nil)) && p.Rules[i].(*Include).IfExists {
valueOfI = "include_if_exists"
}
if typeOfJ == reflect.TypeOf((*Include)(nil)) && p.Rules[j].(*Include).IfExists {
valueOfJ = "include_if_exists"
}
return ruleWeights[valueOfI] < ruleWeights[valueOfJ]
}
return p.Rules[i].Less(p.Rules[j])

2
pkg/aa/template.go
View File

@ -78,7 +78,7 @@ var (
"iouring",
"dbus",
"file",
"include_local",
"include_if_exists",
}
ruleWeights = map[string]int{}