Skip to content

fix reverse tunnel cannot connect if proxy address contains https#24871

Merged
greedy52 merged 2 commits intomasterfrom
STeve/24796_fix_proxy_with_https
Apr 21, 2023
Merged

fix reverse tunnel cannot connect if proxy address contains https#24871
greedy52 merged 2 commits intomasterfrom
STeve/24796_fix_proxy_with_https

Conversation

@greedy52
Copy link
Copy Markdown
Contributor

@greedy52 greedy52 commented Apr 20, 2023

Fixes #24796

Related change:
#23866

Prior to the above change, TLS routing dialer was forcing "tcp" network when "https" is passed in:

tlsConn, err := tlsDialer.DialContext(ctx, "tcp", address)

Instead re-applying the same forcing-network-tcp fix, this change tries to make sure "tcp" is passed in.

@Tener Tener self-requested a review April 20, 2023 06:30
@smallinsky smallinsky self-requested a review April 20, 2023 07:28
Comment thread lib/service/service.go Outdated
@greedy52 greedy52 force-pushed the STeve/24796_fix_proxy_with_https branch from b7cbc8f to 7750ed9 Compare April 21, 2023 02:21
@greedy52 greedy52 requested a review from smallinsky April 21, 2023 02:34
@greedy52 greedy52 self-assigned this Apr 21, 2023
@greedy52 greedy52 marked this pull request as ready for review April 21, 2023 02:36
@greedy52 greedy52 added this pull request to the merge queue Apr 21, 2023
Merged via the queue into master with commit 9b749ce Apr 21, 2023
@greedy52 greedy52 deleted the STeve/24796_fix_proxy_with_https branch April 21, 2023 10:59
@public-teleport-github-review-bot
Copy link
Copy Markdown

@greedy52 See the table below for backport results.

Branch Result
branch/v13 Create PR

@Tener
Copy link
Copy Markdown
Contributor

Tener commented Apr 24, 2023

@greedy52 should we backport this to v13?

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

public_addr can no longer specify protocol

3 participants