From 083ca4e5b763a1e793559c9f98feb8a18c39a45f Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sun, 5 Aug 2018 21:44:41 +0100
Subject: [PATCH] Fix a few gometalinter warnings
---
main.go | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/main.go b/main.go
index c0396ea..84e6f6d 100644
--- a/main.go
+++ b/main.go
@@ -9,6 +9,7 @@ import (
"log"
"log/syslog"
"os"
+ "strings"
"time"
"github.com/elastic/go-libaudit"
@@ -19,7 +20,6 @@ import (
var (
reasmBufferSize = flag.Int("reassembler-buffer", 8192, "reassembler buffer size")
reasmHorizon = flag.Duration("reassembler-timeout", 10*time.Second, "reassembled EOE event timeout")
- idLookup = flag.Bool("id", true, "lookup uid and gid values in messages (requires -i)")
)
func main() {
@@ -36,24 +36,21 @@ func processLogs() error {
if err != nil {
return err
}
- defer output.Close()
+ defer output.Close() // nolint
reassembler, err := libaudit.NewReassembler(*reasmBufferSize, *reasmHorizon, &streamHandler{output})
if err != nil {
return fmt.Errorf("failed to create reassembler: %v", err)
}
- defer reassembler.Close()
+ defer reassembler.Close() // nolint
// Start goroutine to periodically purge timed-out events.
go func() {
t := time.NewTicker(500 * time.Millisecond)
defer t.Stop()
- for {
- select {
- case <-t.C:
- if reassembler.Maintain() != nil {
- return
- }
+ for range t.C {
+ if reassembler.Maintain() != nil {
+ return
}
}
}()
@@ -63,6 +60,14 @@ func processLogs() error {
for s.Scan() {
line := s.Text()
+ // Remove anything before the log type.
+ p := strings.Index(line, "type=")
+ if p < 0 {
+ continue
+ } else if p > 0 {
+ line = line[p:]
+ }
+
auditMsg, err := auparse.ParseLogLine(line)
if err != nil {
log.Printf("failed to parse message header: %v", err)
@@ -97,9 +102,6 @@ func (s *streamHandler) EventsLost(count int) {
log.Printf("detected the loss of %v sequences", count)
}
-func outputMultipleMessages(msgs []*auparse.AuditMessage) {
-}
-
func printJSON(w io.Writer, v interface{}) error {
lbuf := []byte("@cee:")
jsonBytes, err := json.Marshal(v)
--
GitLab