Skip to content
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
merged 7 commits into from
Feb 19, 2025

Conversation

strideynet
Copy link
Contributor

@strideynet strideynet commented Feb 14, 2025

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.

@strideynet
Copy link
Contributor Author

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

@strideynet strideynet marked this pull request as ready for review February 17, 2025 11:36
@strideynet strideynet requested a review from boxofrad February 17, 2025 18:20
Copy link
Contributor

@timothyb89 timothyb89 left a 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!

@strideynet strideynet added this pull request to the merge queue Feb 19, 2025
Merged via the queue into master with commit f33eebb Feb 19, 2025
43 checks passed
@strideynet strideynet deleted the strideynet/fix-ssh-routing-non-multiplexed branch February 19, 2025 11:30
@public-teleport-github-review-bot

@strideynet See the table below for backport results.

Branch Result
branch/v15 Failed
branch/v16 Failed
branch/v17 Create PR

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Machine ID generates broken ssh_config with TLS Routing disabled
3 participants