mirrors/apparmor.d
1
0
Fork 0
mirror of https://github.com/roddhjav/apparmor.d.git synced 2025-01-18 17:08:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(aa): format now merge access list.

Browse source
This commit is contained in:
Alexandre Pujol 2024-05-25 22:22:32 +01:00
parent 54fdf38861
commit 019b6f8197
Failed to generate hash of commit
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkg/aa/profile.go
View file

@ -79,6 +79,21 @@ func (p *Profile) Merge() {
if p.Rules[i].Equals(p.Rules[j]) { if p.Rules[i].Equals(p.Rules[j]) {
p.Rules = append(p.Rules[:j], p.Rules[j+1:]...) p.Rules = append(p.Rules[:j], p.Rules[j+1:]...)
j-- j--
continue
}
// File rule
if typeOfI == reflect.TypeFor[*File]() && typeOfJ == reflect.TypeFor[*File]() {
// Merge access
fileI := p.Rules[i].(*File)
fileJ := p.Rules[j].(*File)
if fileI.Path == fileJ.Path {
fileI.Access = append(fileI.Access, fileJ.Access...)
slices.SortFunc(fileI.Access, cmpFileAccess)
fileI.Access = slices.Compact(fileI.Access)
p.Rules = append(p.Rules[:j], p.Rules[j+1:]...)
j--
}
} }
} }
} }
@ -93,10 +108,10 @@ func (p *Profile) Sort() {
if typeOfI != typeOfJ { if typeOfI != typeOfJ {
valueOfI := typeToValue(typeOfI) valueOfI := typeToValue(typeOfI)
valueOfJ := typeToValue(typeOfJ) valueOfJ := typeToValue(typeOfJ)
if typeOfI == reflect.TypeOf((*Include)(nil)) && p.Rules[i].(*Include).IfExists { if typeOfI == reflect.TypeFor[*Include]() && p.Rules[i].(*Include).IfExists {
valueOfI = "include_if_exists" valueOfI = "include_if_exists"
} }
if typeOfJ == reflect.TypeOf((*Include)(nil)) && p.Rules[j].(*Include).IfExists { if typeOfJ == reflect.TypeFor[*Include]() && p.Rules[j].(*Include).IfExists {
valueOfJ = "include_if_exists" valueOfJ = "include_if_exists"
} }
return ruleWeights[valueOfI] < ruleWeights[valueOfJ] return ruleWeights[valueOfI] < ruleWeights[valueOfJ]
@ -117,7 +132,7 @@ func (p *Profile) Format() {
typeOfJ := reflect.TypeOf(p.Rules[j]) typeOfJ := reflect.TypeOf(p.Rules[j])
// File rule // File rule
if typeOfI == reflect.TypeOf((*File)(nil)) && typeOfJ == reflect.TypeOf((*File)(nil)) { if typeOfI == reflect.TypeFor[*File]() && typeOfJ == reflect.TypeFor[*File]() {
letterI := getLetterIn(fileAlphabet, p.Rules[i].(*File).Path) letterI := getLetterIn(fileAlphabet, p.Rules[i].(*File).Path)
letterJ := getLetterIn(fileAlphabet, p.Rules[j].(*File).Path) letterJ := getLetterIn(fileAlphabet, p.Rules[j].(*File).Path)