From 29a164259867a853dc0ced6be2d07b042d026b15 Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Sun, 6 Oct 2024 20:17:19 +0100
Subject: [PATCH] feat(aa-log): unify the isOwner function across features.

---
 pkg/aa/file.go   | 6 +++---
 pkg/logs/logs.go | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkg/aa/file.go b/pkg/aa/file.go
index 14ade6997..36c7101a4 100644
--- a/pkg/aa/file.go
+++ b/pkg/aa/file.go
@@ -29,7 +29,7 @@ func init() {
 	}
 }
 
-func isOwner(log map[string]string) bool {
+func IsOwner(log map[string]string) bool {
 	fsuid, hasFsUID := log["fsuid"]
 	ouid, hasOuUID := log["ouid"]
 	isDbus := strings.Contains(log["operation"], "dbus")
@@ -98,7 +98,7 @@ func newFileFromLog(log map[string]string) Rule {
 	return &File{
 		Base:      newBaseFromLog(log),
 		Qualifier: newQualifierFromLog(log),
-		Owner:     isOwner(log),
+		Owner:     IsOwner(log),
 		Path:      log["name"],
 		Access:    accesses,
 		Target:    log["target"],
@@ -262,7 +262,7 @@ func newLinkFromLog(log map[string]string) Rule {
 	return &Link{
 		Base:      newBaseFromLog(log),
 		Qualifier: newQualifierFromLog(log),
-		Owner:     isOwner(log),
+		Owner:     IsOwner(log),
 		Path:      log["name"],
 		Target:    log["target"],
 	}
diff --git a/pkg/logs/logs.go b/pkg/logs/logs.go
index 01c4fcbb4..246394604 100644
--- a/pkg/logs/logs.go
+++ b/pkg/logs/logs.go
@@ -200,12 +200,11 @@ func (aaLogs AppArmorLogs) String() string {
 	for _, log := range aaLogs {
 		seen := map[string]bool{"apparmor": true}
 		res.WriteString(state[log["apparmor"]])
-		fsuid := log["fsuid"]
-		ouid := log["ouid"]
+		owner := aa.IsOwner(log)
 
 		for _, key := range keys {
 			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)
 				}
 				if temp, present := template[key]; present {