Skip to content

Fix an issue tsh fails when Proxy is in separate mode and web port is TLS-terminated by a load balancer#33374

Merged
greedy52 merged 1 commit intomasterfrom
STeve/32531_fix_upgrade_on_separate_ssh_port
Oct 12, 2023
Merged

Fix an issue tsh fails when Proxy is in separate mode and web port is TLS-terminated by a load balancer#33374
greedy52 merged 1 commit intomasterfrom
STeve/32531_fix_upgrade_on_separate_ssh_port

Conversation

@greedy52
Copy link
Copy Markdown
Contributor

@greedy52 greedy52 commented Oct 12, 2023

Fixes #32531

When Proxy is in separate mode and web port is TLS-terminated by a load balancer, tsh tries to perform connection upgrades on SSH proxy address.

This change disables connection upgrades if TLS routing is disabled when using the new proxy client.

Port: helpers.Port(t, suite.leaf.SSH),
ALBAddr: albProxy.Addr().String(),
})
t.Run("WebProxyAddr behind ALB", func(t *testing.T) {
Copy link
Copy Markdown
Contributor Author

@greedy52 greedy52 Oct 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed tc.testALPNConnUpgrade so tc.SSH is tested for all setups. In particular StandardAndOnePortSetupMasterALPNDisabled catches the case fixed by this change.

Renamed the subtest, and updated NewUnauthenticatedClienthelper in helpers.instance.go above. No other change to these tests.

@greedy52 greedy52 self-assigned this Oct 12, 2023
@greedy52 greedy52 added tls-routing Issues related to TLS routing backport/branch/v13 labels Oct 12, 2023
@greedy52 greedy52 marked this pull request as ready for review October 12, 2023 17:46
@github-actions github-actions Bot requested a review from Joerger October 12, 2023 17:47
@greedy52 greedy52 added this pull request to the merge queue Oct 12, 2023
Merged via the queue into master with commit 103dd6e Oct 12, 2023
@greedy52 greedy52 deleted the STeve/32531_fix_upgrade_on_separate_ssh_port branch October 12, 2023 18:51
@public-teleport-github-review-bot
Copy link
Copy Markdown

@greedy52 See the table below for backport results.

Branch Result
branch/v13 Failed
branch/v14 Create PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/sm tls-routing Issues related to TLS routing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

tsh 14.0 from macOS Sonoma cannot connect with certificate issues

3 participants