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

refractor(aa-log): merge identical function together.

Browse Source
This commit is contained in:
Alexandre Pujol 2023-09-30 15:34:30 +01:00
parent 95c322d62a
commit cd80a7d919
No known key found for this signature in database
GPG Key ID: C5469996F0DF68EC
3 changed files with 30 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/aa-log/main.go
View File

@ -9,6 +9,7 @@ import (
"fmt"
"io"
"os"
"strings"
"github.com/roddhjav/apparmor.d/pkg/logs"
"golang.org/x/exp/slices"
@ -59,7 +60,7 @@ func aaLog(logger string, path string, profile string) error {
}
if raw {
fmt.Print(logs.Raw(file, profile))
fmt.Print(strings.Join(logs.GetApparmorLogs(file, profile), "\n"))
return nil
}

55
pkg/logs/loggers.go
View File

@ -30,6 +30,33 @@ type systemdLog struct {
Message string `json:"MESSAGE"`
}
// GetApparmorLogs return a list of cleaned apparmor logs from a file
func GetApparmorLogs(file io.Reader, profile string) []string {
res := ""
isAppArmorLog := isAppArmorLogTemplate.Copy()
if profile != "" {
exp := `apparmor=("DENIED"|"ALLOWED"|"AUDIT")`
exp = fmt.Sprintf(exp+`.* (profile="%s.*"|label="%s.*")`, profile, profile)
isAppArmorLog = regexp.MustCompile(exp)
}
// Select Apparmor logs
scanner := bufio.NewScanner(file)
for scanner.Scan() {
line := scanner.Text()
if isAppArmorLog.MatchString(line) {
res += line + "\n"
}
}
// Clean & remove doublon in logs
for _, aa := range regCleanLogs {
res = aa.Regex.ReplaceAllLiteralString(res, aa.Repl)
}
logs := strings.Split(res, "\n")
return util.RemoveDuplicate(logs)
}
// GetAuditLogs return a reader with the logs entries from Auditd
func GetAuditLogs(path string) (io.Reader, error) {
file, err := os.Open(filepath.Clean(path))
@ -92,31 +119,3 @@ func SelectLogFile(path string) string {
}
return ""
}
func Raw(file io.Reader, profile string) string {
res := ""
isAppArmorLog := isAppArmorLogTemplate.Copy()
if profile != "" {
exp := `apparmor=("DENIED"|"ALLOWED"|"AUDIT")`
exp = fmt.Sprintf(exp+`.* (profile="%s.*"|label="%s.*")`, profile, profile)
isAppArmorLog = regexp.MustCompile(exp)
}
// Select Apparmor logs
scanner := bufio.NewScanner(file)
for scanner.Scan() {
line := scanner.Text()
if isAppArmorLog.MatchString(line) {
res += line + "\n"
}
}
// Clean & remove doublon in logs
for _, aa := range regCleanLogs {
res = aa.Regex.ReplaceAllLiteralString(res, aa.Repl)
}
logs := strings.Split(res, "\n")
logs = util.RemoveDuplicate(logs)
return strings.Join(logs, "\n")
}

26
pkg/logs/logs.go
View File

@ -5,8 +5,6 @@
package logs
import (
"bufio"
"fmt"
"io"
"regexp"
"strings"
@ -101,29 +99,7 @@ func toQuote(str string) string {
// NewApparmorLogs return a new ApparmorLogs list of map from a log file
func NewApparmorLogs(file io.Reader, profile string) AppArmorLogs {
log := ""
isAppArmorLog := isAppArmorLogTemplate.Copy()
if profile != "" {
exp := `apparmor=("DENIED"|"ALLOWED"|"AUDIT")`
exp = fmt.Sprintf(exp+`.* (profile="%s.*"|label="%s.*")`, profile, profile)
isAppArmorLog = regexp.MustCompile(exp)
}
// Select Apparmor logs
scanner := bufio.NewScanner(file)
for scanner.Scan() {
line := scanner.Text()
if isAppArmorLog.MatchString(line) {
log += line + "\n"
}
}
// Clean & remove doublon in logs
for _, aa := range regCleanLogs {
log = aa.Regex.ReplaceAllLiteralString(log, aa.Repl)
}
logs := strings.Split(log, "\n")
logs = util.RemoveDuplicate(logs)
logs := GetApparmorLogs(file, profile)
// Parse log into ApparmorLog struct
aaLogs := make(AppArmorLogs, 0)