Skip to content
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

[v14] fix panic during audit upload #44423

Merged
merged 1 commit into from
Jul 18, 2024
Merged

[v14] fix panic during audit upload #44423

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion api/client/auditstreamer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ func (s *auditStreamer) recv() {
}

func (s *auditStreamer) closeWithError(err error) {
s.cancel()
s.mu.Lock()
defer s.mu.Unlock()
s.err = err
s.cancel()
}
4 changes: 3 additions & 1 deletion lib/events/filesessions/fileasync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,9 @@ func (u *Uploader) upload(ctx context.Context, up *upload) error {
return trace.Errorf("operation has been canceled, uploader is closed")
case <-stream.Done():
if errStream, ok := stream.(interface{ Error() error }); ok {
return trace.ConnectionProblem(errStream.Error(), errStream.Error().Error())
if err := errStream.Error(); err != nil {
return trace.ConnectionProblem(err, err.Error())
}
}

return trace.ConnectionProblem(nil, "upload stream terminated unexpectedly")
Expand Down
Loading