Skip to content

Convert tsh ssh to use the proxy transport service instead of ssh #23228

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 4 commits into from
Apr 4, 2023
+1,056 −394
Merged

Convert tsh ssh to use the proxy transport service instead of ssh #23228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc0e271
Convert tsh ssh to use the proxy transport service instead of ssh
rosstimothy Mar 16, 2023
3c21209
fix typos and unify span attributes
rosstimothy Apr 4, 2023
9fc9bda
pass node name to ConnectToNode
rosstimothy Apr 4, 2023
b232b55
simplify jump host resetting
rosstimothy Apr 4, 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
8 changes: 5 additions & 3 deletions api/client/proxy/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,10 @@ func NewClient(ctx context.Context, cfg ClientConfig) (*Client, error) {
}

clt, sshErr := newSSHClient(ctx, &cfg)
if sshErr == nil {
return clt, nil
// Only aggregate errors if there was an issue dialing the grpc server so
// that helpers like trace.IsAccessDenied will still work.
if grpcErr == nil {
return clt, trace.Wrap(sshErr)
Comment thread
GavinFrazar marked this conversation as resolved.
}

return nil, trace.NewAggregate(grpcErr, sshErr)
Expand Down Expand Up @@ -241,7 +243,7 @@ func (c *clusterName) set(name string) {
// clusterCredentials is a [credentials.TransportCredentials] implementation
// that obtains the name of the cluster being connected to from the certificate
// presented by the server. This allows the client to determine the cluster name when
// connecting via using jump hosts.
// connecting via jump hosts.
type clusterCredentials struct {
credentials.TransportCredentials
clusterName *clusterName
Expand Down
2 changes: 1 addition & 1 deletion api/utils/grpc/stream/stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (c *ReadWriter) Write(b []byte) (int, error) {
}

if err := c.source.Send(chunk); err != nil {
return sent, trace.ConnectionProblem(trail.FromGRPC(err), "failed to send on source")
return sent, trace.ConnectionProblem(trail.FromGRPC(err), "failed to send on source: %v", err)
}

sent += len(chunk)
Expand Down
Loading