fix: prevent SSH timeout infinite loop and enable TCP keepalive#7165
Open
ambv wants to merge 2 commits intolibgit2:mainfrom
Open
fix: prevent SSH timeout infinite loop and enable TCP keepalive#7165ambv wants to merge 2 commits intolibgit2:mainfrom
ambv wants to merge 2 commits intolibgit2:mainfrom
Conversation
Contributor
Author
|
This depends on #7167 to have macOS checks green. |
This patch makes two improvements: 1. In case of LIBSSH2_ERROR_TIMEOUT, don't loop forever 2. Enable TCP keepalive on all sockets to detect dead connections The added test demonstrates the hang without the patch.
Remove deprecated OpenSSH configuration options from ci/test.sh: - Protocol 2 (deprecated since OpenSSH 7.4) - RSAAuthentication (deprecated since OpenSSH 7.4) - ChallengeResponseAuthentication (deprecated since OpenSSH 9.6) - HostCertificate pointing to .pub file (invalid configuration) - Duplicate HostKey directive These options were causing warnings with OpenSSH 10.0 in Fedora Rawhide and preventing SSH tests from functioning properly. Tested with OpenSSH 10.0p2 on Fedora Rawhide.
Contributor
Author
|
This is ready for review, @ethomson. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This PR fixes #7143.
There's two commits here.
The first one makes two improvements:
The added test demonstrates the hang without the patch.
The second commit removes deprecated sshd options from
ci/test.shthat were causing warnings with OpenSSH 10.0 in Fedora Rawhide and preventing SSH tests from functioning properly there.