felipe/apparmor.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

aa-log: better quotting management.

Browse source
This commit is contained in:
Alexandre Pujol 2021-12-04 23:53:05 +00:00
parent 1644b70d6d
commit a3f452452a
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cmd/aa-log/main.go
View file

@ -40,6 +40,13 @@ func splitQuoted(r rune) bool {
return !quoted && r == ' ' return !quoted && r == ' '
} }
func toQuote(str string) string {
if strings.Contains(str, " ") {
return `"` + str + `"`
}
return str
}
func removeDuplicateLog(logs []string) []string { func removeDuplicateLog(logs []string) []string {
list := []string{} list := []string{}
keys := map[string]interface{}{"": true} keys := map[string]interface{}{"": true}
@ -52,6 +59,7 @@ func removeDuplicateLog(logs []string) []string {
return list return list
} }
// NewApparmorLogs return a new ApparmorLogs list of map from a log file
func NewApparmorLogs(file *os.File, profile string) AppArmorLogs { func NewApparmorLogs(file *os.File, profile string) AppArmorLogs {
log := "" log := ""
exp := "apparmor=(\"DENIED\"|\"ALLOWED\")" exp := "apparmor=(\"DENIED\"|\"ALLOWED\")"
@ -93,19 +101,16 @@ func NewApparmorLogs(file *os.File, profile string) AppArmorLogs {
for _, item := range tmp { for _, item := range tmp {
kv := strings.Split(item, "=") kv := strings.Split(item, "=")
if len(kv) >= 2 { if len(kv) >= 2 {
if strings.Contains(kv[1], " ") {
aa[kv[0]] = kv[1]
} else {
aa[kv[0]] = strings.Trim(kv[1], `"`) aa[kv[0]] = strings.Trim(kv[1], `"`)
} }
} }
}
aaLogs = append(aaLogs, aa) aaLogs = append(aaLogs, aa)
} }
return aaLogs return aaLogs
} }
// String returns a formatted AppArmor logs string
func (aaLogs AppArmorLogs) String() string { func (aaLogs AppArmorLogs) String() string {
res := "" res := ""
state := map[string]string{ state := map[string]string{
@ -133,9 +138,9 @@ func (aaLogs AppArmorLogs) String() string {
for _, key := range keys { for _, key := range keys {
if log[key] != "" { if log[key] != "" {
if colors[key] != "" { if colors[key] != "" {
res += " " + colors[key] + log[key] + Reset res += " " + colors[key] + toQuote(log[key]) + Reset
} else { } else {
res += " " + key + "=" + log[key] res += " " + key + "=" + toQuote(log[key])
} }
seen[key] = true seen[key] = true
} }
@ -143,7 +148,7 @@ func (aaLogs AppArmorLogs) String() string {
for key, value := range log { for key, value := range log {
if !seen[key] { if !seen[key] {
res += " " + key + "=" + value res += " " + key + "=" + toQuote(value)
} }
} }
res += "\n" res += "\n"