Skip to content

Emit events in CreateAuditStream for v13 clients #34667

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
atburke merged 3 commits into from
Nov 20, 2023
Merged

Emit events in CreateAuditStream for v13 clients #34667

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87ebecb
Emit events in CreateAuditStream for v13 clients
atburke Nov 16, 2023
d58acb2
Update error handling
atburke Nov 16, 2023
6cacafc
Update comment
atburke Nov 17, 2023
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
19 changes: 17 additions & 2 deletions lib/auth/grpcserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,22 @@ func (g *GRPCServer) CreateAuditStream(stream authpb.AuthService_CreateAuditStre
setter := &events.NoOpPreparer{}
start := time.Now()
preparedEvent, _ := setter.PrepareSessionEvent(event)
err = eventStream.RecordEvent(stream.Context(), preparedEvent)
var errors []error
errors = append(errors, eventStream.RecordEvent(stream.Context(), preparedEvent))

// v13 clients expect this request to also emit the event, so emit here
// just for them.
switch event.GetType() {
// Don't emit really verbose events.
case events.ResizeEvent, events.SessionDiskEvent, events.SessionPrintEvent, events.AppSessionRequestEvent, "":
default:
clientVersion, versionExists := metadata.ClientVersionFromContext(stream.Context())
if versionExists && semver.New(clientVersion).Major <= 13 {
errors = append(errors, auth.EmitAuditEvent(stream.Context(), event))
}
}

err = trace.NewAggregate(errors...)
if err != nil {
switch {
case events.IsPermanentEmitError(err):
Comment on lines +367 to 370
Copy link
Copy Markdown
Contributor

@rosstimothy rosstimothy Nov 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to consider the aggregated errors or just the error from recording the event in IsPermanentEmitError?

Copy link
Copy Markdown
Contributor Author

@atburke atburke Nov 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The v13 auth server considers the aggregated errors, so I figured we should do that here too.

Expand All @@ -360,7 +375,7 @@ func (g *GRPCServer) CreateAuditStream(stream authpb.AuthService_CreateAuditStre
return trace.Wrap(err)
}
}
event.Size()

processed += int64(event.Size())
seconds := time.Since(streamStart) / time.Second
counter++
Expand Down