authz: Stdout logger

authz/audit/stdout/stdout_logger.go

@@ -32,7 +32,10 @@ import (
 var grpcLogger = grpclog.Component("authz-audit")
 
 func init() {
-	audit.RegisterLoggerBuilder(&loggerBuilder{})
+	l := log.New(os.Stdout, "", 0)
+	audit.RegisterLoggerBuilder(&loggerBuilder{
+		goLogger: l,
+	})
 }
 
 type event struct {
@@ -41,7 +44,7 @@ type event struct {
 	PolicyName     string `json:"policy_name"`
 	MatchedRule    string `json:"matched_rule"`
 	Authorized     bool   `json:"authorized"`
-	Timestamp      int64  `json:"timestamp"` // Time when the audit event is logged via Log method
+	Timestamp      string `json:"timestamp"` // Time when the audit event is logged via Log method
 }
 
 // logger implements the audit.Logger interface by logging to standard output.
@@ -50,7 +53,7 @@ type logger struct {
 }
 
 // Log marshals the audit.Event to json and prints it to standard output.
-func (logger *logger) Log(event *audit.Event) {
+func (l *logger) Log(event *audit.Event) {
 	jsonContainer := map[string]interface{}{
 		"grpc_audit_log": convertEvent(event),
 	}
@@ -59,7 +62,7 @@ func (logger *logger) Log(event *audit.Event) {
 		grpcLogger.Errorf("failed to marshal AuditEvent data to JSON: %v", err)
 		return
 	}
-	logger.goLogger.Println(string(jsonBytes))
+	l.goLogger.Println(string(jsonBytes))
 }
 
 // loggerConfig represents the configuration for the stdout logger.
@@ -68,7 +71,9 @@ type loggerConfig struct {
 	audit.LoggerConfig
 }
 
-type loggerBuilder struct{}
+type loggerBuilder struct {
+	goLogger *log.Logger
+}
 
 func (loggerBuilder) Name() string {
 	return "stdout_logger"
@@ -77,10 +82,9 @@ func (loggerBuilder) Name() string {
 // Build returns a new instance of the stdout logger.
 // Passed in configuration is ignored as the stdout logger does not
 // expect any configuration to be provided.
-func (*loggerBuilder) Build(audit.LoggerConfig) audit.Logger {
-	l := log.New(os.Stdout, "", log.LstdFlags)
+func (lb *loggerBuilder) Build(audit.LoggerConfig) audit.Logger {
 	return &logger{
-		goLogger: l,
+		goLogger: lb.goLogger,
 	}
 }
 
@@ -99,6 +103,6 @@ func convertEvent(auditEvent *audit.Event) *event {
 		PolicyName:     auditEvent.PolicyName,
 		MatchedRule:    auditEvent.MatchedRule,
 		Authorized:     auditEvent.Authorized,
-		Timestamp:      time.Now().Unix(),
+		Timestamp:      time.Now().Format(time.RFC3339Nano),
 	}
 }

authz/audit/stdout/stdout_logger_test.go

@@ -22,6 +22,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"log"
+	"os"
 	"testing"
 	"time"
 
@@ -67,22 +68,24 @@ func (s) TestStdoutLogger_Log(t *testing.T) {
 			before := time.Now().Unix()
 			var buf bytes.Buffer
 			l := log.New(&buf, "", 0)
-			auditLogger := &logger{
-				goLogger: l,
-			}
+			builder := &loggerBuilder{goLogger: l}
+			auditLogger := builder.Build(nil)
 			auditLogger.Log(test.event)
 			var container map[string]interface{}
 			if err := json.Unmarshal(buf.Bytes(), &container); err != nil {
 				t.Fatalf("Failed to unmarshal audit log event: %v", err)
 			}
 			innerEvent := extractEvent(container["grpc_audit_log"].(map[string]interface{}))
-			if innerEvent.Timestamp == 0 {
+			if innerEvent.Timestamp == "" {
 				t.Fatalf("Resulted event has no timestamp: %v", innerEvent)
 			}
 			after := time.Now().Unix()
-			if before > innerEvent.Timestamp || after < innerEvent.Timestamp {
-				t.Fatalf("The audit event timestamp is outside of the test interval: test start %v, event timestamp %v, test end %v",
-					before, innerEvent.Timestamp, after)
+			innerEventUnixTime, err := time.Parse(time.RFC3339Nano, innerEvent.Timestamp)
+			if err != nil {
+				t.Fatalf("Failed to convert event timestamp into Unix time format: %v", err)
+			}
+			if before > innerEventUnixTime.Unix() || after < innerEventUnixTime.Unix() {
+				t.Errorf("The audit event timestamp is outside of the test interval: test start %v, event timestamp %v, test end %v", before, innerEventUnixTime.Unix(), after)
 			}
 			if diff := cmp.Diff(trimEvent(innerEvent), test.event); diff != "" {
 				t.Fatalf("Unexpected message\ndiff (-got +want):\n%s", diff)
@@ -92,7 +95,8 @@ func (s) TestStdoutLogger_Log(t *testing.T) {
 }
 
 func (s) TestStdoutLoggerBuilder_NilConfig(t *testing.T) {
-	builder := &loggerBuilder{}
+	l := log.New(os.Stdout, "", log.LstdFlags)
+	builder := &loggerBuilder{goLogger: l}
 	config, err := builder.ParseLoggerConfig(nil)
 	if err != nil {
 		t.Fatalf("Failed to parse stdout logger configuration: %v", err)
@@ -117,7 +121,7 @@ func extractEvent(container map[string]interface{}) event {
 		PolicyName:     container["policy_name"].(string),
 		MatchedRule:    container["matched_rule"].(string),
 		Authorized:     container["authorized"].(bool),
-		Timestamp:      int64(container["timestamp"].(float64)),
+		Timestamp:      container["timestamp"].(string),
 	}
 }