mirror of
https://github.com/roddhjav/apparmor.d.git
synced 2024-11-14 23:43:56 +01:00
aa-log: cosmetic.
This commit is contained in:
parent
0294ef3270
commit
7f7a2e5eda
@ -33,8 +33,7 @@ type AppArmorLogs []AppArmorLog
|
||||
|
||||
func removeDuplicateLog(logs []string) []string {
|
||||
list := []string{}
|
||||
keys := make(map[string]interface{})
|
||||
keys[""] = true
|
||||
keys := map[string]interface{}{"": true}
|
||||
for _, log := range logs {
|
||||
if _, v := keys[log]; !v {
|
||||
keys[log] = true
|
||||
@ -96,11 +95,13 @@ func (aaLogs AppArmorLogs) String() string {
|
||||
"DENIED": BoldRed + "DENIED " + Reset,
|
||||
"ALLOWED": BoldGreen + "ALLOWED" + Reset,
|
||||
}
|
||||
// Order of impression
|
||||
keys := []string{
|
||||
"profile", "operation", "name", "info", "comm", "laddr",
|
||||
"lport", "faddr", "fport", "family", "sock_type", "protocol",
|
||||
"requested_mask", "denied_mask", // "fsuid", "ouid", "FSUID", "OUID",
|
||||
"requested_mask", "denied_mask", "signal", "peer", // "fsuid", "ouid", "FSUID", "OUID",
|
||||
}
|
||||
// Optional colors template to use
|
||||
colors := map[string]string{
|
||||
"profile": FgBlue,
|
||||
"operation": FgYellow,
|
||||
@ -109,8 +110,8 @@ func (aaLogs AppArmorLogs) String() string {
|
||||
"denied_mask": "denied_mask=" + BoldRed,
|
||||
}
|
||||
for _, log := range aaLogs {
|
||||
seen := map[string]bool{"apparmor": true}
|
||||
res += state[log["apparmor"]]
|
||||
delete(log, "apparmor")
|
||||
|
||||
for _, key := range keys {
|
||||
if log[key] != "" {
|
||||
@ -119,13 +120,15 @@ func (aaLogs AppArmorLogs) String() string {
|
||||
} else {
|
||||
res += " " + key + "=" + log[key]
|
||||
}
|
||||
delete(log, key)
|
||||
seen[key] = true
|
||||
}
|
||||
}
|
||||
|
||||
for key, value := range log {
|
||||
if !seen[key] {
|
||||
res += " " + key + "=" + value
|
||||
}
|
||||
}
|
||||
res += "\n"
|
||||
}
|
||||
return res
|
||||
@ -139,12 +142,13 @@ func main() {
|
||||
|
||||
file, err := os.Open(LogFile)
|
||||
if err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return
|
||||
fmt.Println(err)
|
||||
os.Exit(1)
|
||||
}
|
||||
defer func() {
|
||||
if err := file.Close(); err != nil {
|
||||
fmt.Println("Error closing file:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}()
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
module gitlab.com/roddhjav/apparmor.d
|
||||
module github.com/roddhjav/apparmor.d
|
||||
|
||||
go 1.17
|
||||
|
Loading…
Reference in New Issue
Block a user