Add fixed header and write skipping to multiplexer #35762
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
espadolini
added
no-changelog
espadolini
changed the title
espadolini
force-pushed
the
espadolini/multiplexer-header
branch
from
236a896
to
9496c1f
Compare
AntonAM
approved these changes
Dec 15, 2023
|
|
||
| func TestFixedHeader(t *testing.T) { | ||
| t.Parallel() | ||
| require := require.New(t) |
lib/multiplexer/wrappers.go
Outdated
| @@ -37,6 +37,7 @@ type Conn struct { | |||
| protocol Protocol | |||
| proxyLine *ProxyLine | |||
| reader *bufio.Reader | |||
| writeSkip int | |||
There was a problem hiding this comment.
Do you think just skipping amount of bytes without controlling those bytes match prefix is enough?
We most probably should be fine, but if something goes wrong there's possibility for some cryptic bugs 😅
There was a problem hiding this comment.
You're right, I added a check for that.
rosstimothy
approved these changes
Dec 15, 2023
public-teleport-github-review-bot
bot
removed request for
tcsc and
smallinsky
smallinsky
approved these changes
Dec 15, 2023
AntonAM
approved these changes
Dec 15, 2023
rosstimothy
approved these changes
Dec 18, 2023
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
|
@espadolini See the table below for backport results.
|
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.
Add the ability to unconditionally send some fixed header to the client before protocol detection in
multiplexer.Mux, together with the ability to skip the same amount of data sent from the application side; this lets us send a SSH version identification header before we run PROXY header detection, where appropriate.Fixes #35647.
Changelog: Restored direct dial SSH server compatibility with certain SSH tools such as
ssh-keyscan(#35647)