Changed format to json and added custom marshalling

Author: erm-g

authz/audit/stdout_logger.go

@@ -28,17 +28,27 @@ import (
 
 var grpcLogger = grpclog.Component("authz-audit")
 
+type StdoutEvent struct {
+	FullMethodName string `json:"fullMethodName"`
+	Principal      string `json:"principal"`
+	PolicyName     string `json:"policyName"`
+	MatchedRule    string `json:"matchedRule"`
+	Authorized     bool   `json:"authorized"`
+	//Timestamp is populated using time.Now() during StdoutLogger.Log call
+	Timestamp string `json:"timestamp"`
+}
+
 type StdOutLogger struct {
 }
 
 func (logger *StdOutLogger) Log(event *Event) {
-	jsonBytes, err := json.Marshal(event)
+	jsonBytes, err := json.Marshal(convertEvent(event)) //internal structure mimicking event with annotations how to marshall to json
 	if err != nil {
 		grpcLogger.Errorf("failed to marshal AuditEvent data to JSON: %v", err)
 	}
-	message := fmt.Sprintf("[AuthZ Audit StdOutLogger] %s %v",
-		time.Now().Format(time.RFC3339), string(jsonBytes))
-	fmt.Println(message)
+	//message := fmt.Sprintf("[AuthZ Audit StdOutLogger] %s %v",
+	//	time.Now().Format(time.RFC3339), string(jsonBytes))
+	fmt.Println(string(jsonBytes)) // built in log.go
 }
 
 const (
@@ -64,3 +74,14 @@ func (StdOutLoggerBuilder) ParseLoggerConfig(config json.RawMessage) (LoggerConf
 		"StdOutLogger doesn't support custom configs", string(config))
 	return &StdoutLoggerConfig{}, nil
 }
+
+func convertEvent(event *Event) StdoutEvent {
+	return StdoutEvent{
+		FullMethodName: event.FullMethodName,
+		Principal:      event.Principal,
+		PolicyName:     event.PolicyName,
+		MatchedRule:    event.MatchedRule,
+		Authorized:     event.Authorized,
+		Timestamp:      time.Now().Format(time.RFC3339),
+	}
+}

authz/audit/stdout_logger_test.go

@@ -50,9 +50,31 @@ func TestStdOutLogger_Log(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	expected := ` {"FullMethodName":"","Principal":"test principal","PolicyName":"test policy","MatchedRule":"","Authorized":false}`
-	if buf.String() != ("[AuthZ Audit StdOutLogger] " + time.Now().Format(time.RFC3339) + expected + "\n") {
+	expected := `{"fullMethodName":"","principal":"test principal","policyName":"test policy","matchedRule":"","authorized":false`
+	if buf.String() != (expected + ",\"timestamp\":\"" + time.Now().Format(time.RFC3339) + "\"}\n") {
 		t.Fatalf("unexpected error\nwant:%v\n got:%v", expected, buf.String())
 	}
 	os.Stdout = orig
 }
+
+//func TestStdOutLogger_LogFullMethodName(t *testing.T) {
+//	orig := os.Stdout
+//	r, w, _ := os.Pipe()
+//	os.Stdout = w
+//
+//	event := &Event{PolicyName: "test policy", Principal: "test principal", FullMethodName: "/helloworld.Greeter/SayHello"}
+//	auditLogger.Log(event)
+//
+//	w.Close()
+//	var buf bytes.Buffer
+//	_, err := io.Copy(&buf, r)
+//	if err != nil {
+//		log.Fatal(err)
+//	}
+//
+//	expected := `{"fullMethodName":"","principal":"test principal","policyName":"test policy","matchedRule":"","authorized":false`
+//	if buf.String() != (expected + ",\"timestamp\":\"" + time.Now().Format(time.RFC3339) + "\"}\n") {
+//		t.Fatalf("unexpected error\nwant:%v\n got:%v", expected, buf.String())
+//	}
+//	os.Stdout = orig
+//}