ssh: Add retries to setupProxy #308
Merged
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
initialConnection retries multiple times to establish the TCP connection which will be used for ssh communication. This commit adds a generic helper to handle the retry which will be useful in the next commits. Signed-off-by: Christophe Fergeau <[email protected]>
|
/lgtm with the exception why we use |
When using podman-machine with applehv, sometimes gvproxy would die shortly after being started. The following happens: - podman starts gvproxy with --listen-vfkit - gvproxy starts and waits for vfkit to create a network connection - podman starts vfkit - vfkit creates the VM and connects to gvproxy - gvproxy resumes its execution, and tries to create the ssh forwards podman asked for on the command line - gvproxy fails to create the ssh forward and exits This happens because setupProxy fails in (*Bastion).reconnect with "ssh: handshake failed: EOF". This is related to https://www.man7.org/linux/man-pages/man8/systemd-user-sessions.8.html even if it's possible to create a TCP connection to the ssh port, sshd/pam won't necessarily allow you to connect at the ssh level. This commit fixes this bug by adding a retry to the calls to CreateBastion() to complement the retries already present in initialConnection(). CreateBastion now returns *Bastion instead of Bastion as the latter type is not `comparable` which is required by the generic `retry` function. Signed-off-by: Christophe Fergeau <[email protected]>
I added this to the commit log:
|
gbraad
approved these changes
Jan 11, 2024
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cfergeau, gbraad The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-merge-bot
bot
merged commit 3cb88d9
into
containers:main
13 of 18 checks passed
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.
When using podman-machine with applehv, sometimes gvproxy would die shortly
after being started. The following happens:
podman asked for on the command line
This happens because setupProxy fails in (*Bastion).reconnect with
"ssh: handshake failed: EOF". This is related to
https://www.man7.org/linux/man-pages/man8/systemd-user-sessions.8.html even
if it's possible to create a TCP connection to the ssh port, sshd/pam won't
necessarily allow you to connect at the ssh level.
This commit fixes this bug by adding a retry to the calls to
CreateBastion() to complement the retries already present in
initialConnection().