Handle cancelation while establishing ssh connection #832
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Relevant to #831 |
azazeal
reviewed
Feb 10, 2022
| c.conn, c.client = conn, ssh.NewClient(conn, chans, reqs) | ||
| return nil | ||
| // ssh.NewClientConn doesn't take a context, so we need to handle cancelation on our end | ||
| go func() { |
There was a problem hiding this comment.
it'd be far simpler instead of launching this in the background, and since you already have a reference to the underlying connection, to just close it on context cancellation instead of this.
azazeal
reviewed
Feb 10, 2022
| respCh <- connResp{nil, conn, client} | ||
| }() | ||
|
|
||
| for { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #830
Possibly relevant issue golang/go#20288
Seems like cancelation isn't being handled in
ssh.NewClientConn. Comments on that issue indicate that cancelation will happen if thenet.Connbeing passed in is correctly closed on cancel. This is likely not happening as needed due to the way we pass in a connection from the agent's dialer.Handling cancelation independently solves the issue for now.