Skip to content

feat: log all audit events separately to prevent missing events #2086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cemalkilic merged 1 commit into from
Jul 30, 2025
Merged

feat: log all audit events separately to prevent missing events #2086

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions internal/models/audit_log_entry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@ import (
"net/http"
"time"

"maps"

"github.com/gofrs/uuid"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/supabase/auth/internal/conf"
"github.com/supabase/auth/internal/observability"
"github.com/supabase/auth/internal/storage"
"github.com/supabase/auth/internal/utilities"
)

type AuditAction string
Expand Down Expand Up @@ -120,6 +123,37 @@ func NewAuditLogEntry(config conf.AuditLogConfiguration, r *http.Request, tx *st
"auth_event": logrus.Fields(payload),
})

// AUDIT LOGGING FIX: Log each audit event immediately as a separate log entry
//
// BUG: The observability.LogEntrySetFields() above adds to request context, causing
// multiple audit events in the same request to overwrite each other. For example,
// refresh token requests call NewAuditLogEntry() twice (token_refreshed, then
// token_revoked) but only the last event (token_revoked) was logged.
//
// SOLUTION: Create immediate separate log entries with "auth_audit_event" key.
// This ensures all audit events are captured without overwriting.
//
// TRANSITION: We keep the existing "auth_event" for backward compatibility during
// the transition period. This fix may impact metrics that count audit events,
// as previously missing events (like token_refreshed) will now appear in logs.
// Eventually, we should remove the observability.LogEntrySetFields() call above
// once new logging is proven stable.
auditLogPayload := make(map[string]interface{})
maps.Copy(auditLogPayload, payload)
auditLogPayload["audit_log_id"] = id
auditLogPayload["ip_address"] = ipAddress
auditLogPayload["created_at"] = time.Now().UTC()

if requestID := utilities.GetRequestID(r.Context()); requestID != "" {
auditLogPayload["request_id"] = requestID
}
if userAgent := r.Header.Get("User-Agent"); userAgent != "" {
auditLogPayload["user_agent"] = userAgent
}
logrus.WithFields(logrus.Fields{
"auth_audit_event": auditLogPayload,
}).Info("audit_event")

if config.DisablePostgres {
return nil
}
Expand Down