Skip to content

EXT-1507 fix anonymous subject #161

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
merged 1 commit into from
Sep 29, 2025
Merged

EXT-1507 fix anonymous subject #161

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
12 changes: 10 additions & 2 deletions internal/audit/audit_event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"go.uber.org/zap"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
"strings"
"time"
"ydbcp/internal/server/grpcinfo"
"ydbcp/internal/util/xlog"
Expand Down Expand Up @@ -84,7 +83,7 @@ func (e *Event) MarshalJSON() ([]byte, error) {
Component: e.Component,
MethodName: e.MethodName,
ContainerID: e.ContainerID,
Subject: strings.Join([]string{e.Subject, "as"}, "@"),
Subject: formatSubject(e.Subject),
SanitizedToken: e.SanitizedToken,
GRPCRequest: marshalProtoMessage(e.GRPCRequest),
Status: e.Status,
Expand Down Expand Up @@ -130,6 +129,15 @@ func getStatus(inProgress bool, err error) (string, string) {
return status, reason
}

func formatSubject(subject string) string {
switch subject {
case "", "{none}":
return "{none}"
default:
return subject + "@as"
}
}

func GRPCCallAuditEvent(
ctx context.Context,
methodName string,
Expand Down