-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix tbot
SSH with non-multiplexed configuration
#52177
Merged
strideynet
merged 7 commits into
master
from
strideynet/fix-ssh-routing-non-multiplexed
Feb 19, 2025
Merged
Fix tbot
SSH with non-multiplexed configuration
#52177
strideynet
merged 7 commits into
master
from
strideynet/fix-ssh-routing-non-multiplexed
Feb 19, 2025
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
Tested using master and this branch with a ports seperate setup: proxy_service:
enabled: "yes"
public_addr:
- leaf.tele.ottr.sh:443
- fael.tele.ottr.sh:443
acme:
enabled: no
trust_x_forwarded_for: true
listen_addr: 127.0.0.1:3023
ssh_public_addr: leaf.tele.ottr.sh:3023
tunnel_listen_addr: 0.0.0.0:3024 |
timothyb89
approved these changes
Feb 19, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Glad to see a pretty straightforward fix!
ryanclark
approved these changes
Feb 19, 2025
@strideynet See the table below for backport results.
|
This was referenced Feb 19, 2025
strideynet
added a commit
that referenced
this pull request
Feb 19, 2025
* Fix routing for identity output when multiplexing is disabled * Remove old testdata * Fix SSH Multiplexer * Centralize logic around ssh port selection * Move fallaback into TLSRoutingEnabled only * Adjust address selection * Fix spelling
carloscastrojumo
pushed a commit
to carloscastrojumo/teleport
that referenced
this pull request
Feb 19, 2025
* Fix routing for identity output when multiplexing is disabled * Remove old testdata * Fix SSH Multiplexer * Centralize logic around ssh port selection * Move fallaback into TLSRoutingEnabled only * Adjust address selection * Fix spelling
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 20, 2025
* Fix routing for identity output when multiplexing is disabled * Remove old testdata * Fix SSH Multiplexer * Centralize logic around ssh port selection * Move fallaback into TLSRoutingEnabled only * Adjust address selection * Fix spelling
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 20, 2025
* Fix routing for identity output when multiplexing is disabled * Remove old testdata * Fix SSH Multiplexer * Centralize logic around ssh port selection * Move fallaback into TLSRoutingEnabled only * Adjust address selection * Fix spelling
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.
Closes #52159
changelog: Resolves an issue with tbot where the web proxy port would be used instead of the SSH proxy port when ports separate mode is in use.