Repository navigation
Support OpenSSH 9.2+ for SshSocksConnector - #48
Merged
Merged
Conversation
There was a problem hiding this comment.
🟢 Approval recommended
The focused compatibility change matches documented OpenSSH output and has appropriate regression coverage.
0 open findings
What changed in this PR
Adds compatibility with OpenSSH 9.2+ listener messages while preserving older formats.
Changes:
- Expands SOCKS listener detection for integer and floating-point inactivity timeouts.
- Adds integration coverage for supported and unrelated messages.
| File | Description |
|---|---|
src/SshSocksConnector.php |
Accepts current OpenSSH listener formats. |
tests/IntegrationSshSocksConnectorTest.php |
Tests listener recognition and rejection. |
🧠 Review effort: Balanced
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
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
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 changeset adds support for OpenSSH 9.2+ to the
SshSocksConnector. The connector waits for thesshclient to report its local SOCKS listener before forwarding any connections, but OpenSSH 9.2 (2023) changed this debug line to include the channel type and its new inactivity timeout (openssh/openssh-portable@2d1ff2b943). Since then, the line never matched and every connection attempt would hang, which affects most current systems such as Debian 12+ (2023) and Ubuntu 24.04+ (2024). The connector now accepts all known formats, including the floating point timeout printed since OpenSSH 10.6 (2026, openssh/openssh-portable@a253258c):The
SshProcessConnectoris not affected, as the lines it relies on are unchanged. Older OpenSSH versions continue to work as before and are covered by the new tests, so this should be safe to apply.Builds on top of #8, #11 and #47
Refs openssh/openssh-portable@2d1ff2b943 and openssh/openssh-portable@a253258c