mirrors/apparmor.d
1
0
Fork 0
mirror of https://github.com/roddhjav/apparmor.d.git synced 2024-11-14 23:43:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(aa-log): unify the isOwner function across features.

Browse Source
This commit is contained in:
Alexandre Pujol 2024-10-06 20:17:19 +01:00
parent 856c425dd5
commit 29a1642598
No known key found for this signature in database
GPG Key ID: C5469996F0DF68EC
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/aa/file.go
View File

@ -29,7 +29,7 @@ func init() {
} }
} }
func isOwner(log map[string]string) bool { func IsOwner(log map[string]string) bool {
fsuid, hasFsUID := log["fsuid"] fsuid, hasFsUID := log["fsuid"]
ouid, hasOuUID := log["ouid"] ouid, hasOuUID := log["ouid"]
isDbus := strings.Contains(log["operation"], "dbus") isDbus := strings.Contains(log["operation"], "dbus")
@ -98,7 +98,7 @@ func newFileFromLog(log map[string]string) Rule {
return &File{ return &File{
Base: newBaseFromLog(log), Base: newBaseFromLog(log),
Qualifier: newQualifierFromLog(log), Qualifier: newQualifierFromLog(log),
Owner: isOwner(log), Owner: IsOwner(log),
Path: log["name"], Path: log["name"],
Access: accesses, Access: accesses,
Target: log["target"], Target: log["target"],
@ -262,7 +262,7 @@ func newLinkFromLog(log map[string]string) Rule {
return &Link{ return &Link{
Base: newBaseFromLog(log), Base: newBaseFromLog(log),
Qualifier: newQualifierFromLog(log), Qualifier: newQualifierFromLog(log),
Owner: isOwner(log), Owner: IsOwner(log),
Path: log["name"], Path: log["name"],
Target: log["target"], Target: log["target"],
} }

5
pkg/logs/logs.go
View File

@ -200,12 +200,11 @@ func (aaLogs AppArmorLogs) String() string {
for _, log := range aaLogs { for _, log := range aaLogs {
seen := map[string]bool{"apparmor": true} seen := map[string]bool{"apparmor": true}
res.WriteString(state[log["apparmor"]]) res.WriteString(state[log["apparmor"]])
fsuid := log["fsuid"] owner := aa.IsOwner(log)
ouid := log["ouid"]
for _, key := range keys { for _, key := range keys {
if item, present := log[key]; present { if item, present := log[key]; present {
if key == "name" && fsuid == ouid && !strings.Contains(log["operation"], "dbus") { if key == "name" && owner {
res.WriteString(template[key] + " owner" + reset) res.WriteString(template[key] + " owner" + reset)
} }
if temp, present := template[key]; present { if temp, present := template[key]; present {