fix: audit timestamp generation

rond-authz · Jan 30, 2025 · 955c451 · 955c451
1 parent 02d87e5
commit 955c451
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/internal/audit/agent_log_test.go b/internal/audit/agent_log_test.go
@@ -44,7 +44,8 @@ func TestLogAgent(t *testing.T) {
 			ID:     "some user",
 			Groups: []string{"g1", "g2"},
 		},
-		Request: RequestInfo{Body: []byte("some body")},
+		Request:   RequestInfo{Body: []byte("some body")},
+		Timestamp: 123123123,
 	})
 
 	entries := hook.AllEntries()
@@ -59,9 +60,6 @@ func TestLogAgent(t *testing.T) {
 	require.NotEmpty(t, trailDataMap["id"])
 	delete(trailDataMap, "id")
 
-	require.NotNil(t, trailData.(map[string]interface{})["timestamp"])
-	delete(trailData.(map[string]interface{}), "timestamp")
-
 	require.Equal(t, map[string]any{
 		"aggregationId": "the-aggregation-id",
 		"authorization": map[string]any{
@@ -81,6 +79,7 @@ func TestLogAgent(t *testing.T) {
 			"groups": []string{"g1", "g2"},
 			"id":     "some user",
 		},
+		"timestamp": int64(123123123),
 	}, trailData)
 }
 
@@ -108,7 +107,8 @@ func TestLogAgentWithGlobalLabels(t *testing.T) {
 			ID:     "some user",
 			Groups: []string{"g1", "g2"},
 		},
-		Request: RequestInfo{Body: []byte("some body")},
+		Request:   RequestInfo{Body: []byte("some body")},
+		Timestamp: 543543543,
 	})
 
 	entries := hook.AllEntries()
@@ -123,9 +123,6 @@ func TestLogAgentWithGlobalLabels(t *testing.T) {
 	require.NotEmpty(t, trailDataMap["id"])
 	delete(trailDataMap, "id")
 
-	require.NotNil(t, trailData.(map[string]interface{})["timestamp"])
-	delete(trailData.(map[string]interface{}), "timestamp")
-
 	require.Equal(t, map[string]any{
 		"aggregationId": "the-aggregation-id",
 		"authorization": map[string]any{
@@ -147,5 +144,6 @@ func TestLogAgentWithGlobalLabels(t *testing.T) {
 			"groups": []string{"g1", "g2"},
 			"id":     "some user",
 		},
+		"timestamp": int64(543543543),
 	}, trailData)
 }
diff --git a/internal/audit/audit.go b/internal/audit/audit.go
@@ -16,7 +16,6 @@ package audit
 
 import (
 	"slices"
-	"time"
 
 	"github.com/google/uuid"
 	"github.com/rond-authz/rond/internal/utils"
@@ -46,6 +45,7 @@ type Audit struct {
 	Subject       SubjectInfo
 	Request       RequestInfo
 	Labels        Labels
+	Timestamp     int64
 }
 
 type AuthzInfo struct {
@@ -100,7 +100,7 @@ func (a *Audit) toPrint(data map[string]any) auditToPrint {
 		Subject:   a.Subject,
 		Request:   a.Request,
 		Labels:    a.Labels,
-		Timestamp: time.Now().Unix(),
+		Timestamp: a.Timestamp,
 	}
 	if data != nil {
 		print.applyDataFromPolicy(data)

diff --git a/sdk/evaluator.go b/sdk/evaluator.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"time"
 
 	"github.com/rond-authz/rond/core"
 	"github.com/rond-authz/rond/internal/audit"
@@ -124,6 +125,7 @@ func (e evaluator) EvaluateRequestPolicy(ctx context.Context, rondInput core.Inp
 				Path:      rondInput.Request.Path,
 				UserAgent: rondInput.Request.Headers.Get(userAgentHeaderKey),
 			},
+			Timestamp: time.Now().Unix(),
 		}); err != nil {
 			logger.WithField("error", map[string]any{
 				"aggregationId": options.Audit.AggregationID,
@@ -160,6 +162,7 @@ func (e evaluator) EvaluateRequestPolicy(ctx context.Context, rondInput core.Inp
 			Path:      rondInput.Request.Path,
 			UserAgent: rondInput.Request.Headers.Get(userAgentHeaderKey),
 		},
+		Timestamp: time.Now().Unix(),
 	}); err != nil {
 		logger.WithField("error", map[string]any{
 			"aggregationId": options.Audit.AggregationID,
@@ -213,6 +216,7 @@ func (e evaluator) EvaluateResponsePolicy(ctx context.Context, rondInput core.In
 				Path:      rondInput.Request.Path,
 				UserAgent: rondInput.Request.Headers.Get(userAgentHeaderKey),
 			},
+			Timestamp: time.Now().Unix(),
 		}); err != nil {
 			logger.WithField("error", map[string]any{
 				"aggregationId": options.Audit.AggregationID,
@@ -237,6 +241,7 @@ func (e evaluator) EvaluateResponsePolicy(ctx context.Context, rondInput core.In
 			Path:      rondInput.Request.Path,
 			UserAgent: rondInput.Request.Headers.Get(userAgentHeaderKey),
 		},
+		Timestamp: time.Now().Unix(),
 	}); err != nil {
 		logger.WithField("error", map[string]any{
 			"aggregationId": options.Audit.AggregationID,