Skip to content

[v15] Prevent leaking gRPC clients when connecting to the cluster fails #38005

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
rosstimothy merged 1 commit into from
Feb 9, 2024
Merged

[v15] Prevent leaking gRPC clients when connecting to the cluster fails #38005

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: 5 additions & 7 deletions lib/service/connect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,21 +543,19 @@ func (process *TeleportProcess) firstTimeConnect(role types.SystemRole) (*Connec
Type: types.HostCA,
}, false)
if err != nil {
return nil, trace.Wrap(err)
return nil, trace.NewAggregate(err, connector.Close())
}

err = process.storage.WriteIdentity(auth.IdentityCurrent, *identity)
if err != nil {
if err := process.storage.WriteIdentity(auth.IdentityCurrent, *identity); err != nil {
process.log.Warningf("Failed to write %v identity: %v.", role, err)
}

err = process.storage.WriteState(role, auth.StateV2{
if err := process.storage.WriteState(role, auth.StateV2{
Spec: auth.StateSpecV2{
Rotation: ca.GetRotation(),
},
})
if err != nil {
return nil, trace.Wrap(err)
}); err != nil {
return nil, trace.NewAggregate(err, connector.Close())
}
process.log.Infof("The process successfully wrote the credentials and state of %v to the disk.", role)
return connector, nil
Expand Down