fix: direct embedded derp traffic directly to the server #6595
+34
−38
Conversation
This file contains hidden or 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
mafredri
approved these changes
Mar 14, 2023
coderd/workspaceagents.go
Outdated
| Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(), 128)}, | ||
| DERPMap: derpMap, | ||
| Logger: api.Logger.Named("tailnet"), | ||
| BlockEndpoints: true, |
There was a problem hiding this comment.
Why do we set BlockEndpoints now? I'm sure there's a reason, just wondering. 😄
There was a problem hiding this comment.
This is a mistake! Fantastic catch 🥴🥴🥴
| }) | ||
| if err != nil { | ||
| _ = clientConn.Close() | ||
| _ = serverConn.Close() | ||
| return nil, xerrors.Errorf("create tailnet conn: %w", err) | ||
| } | ||
| conn.SetDERPRegionDialer(func(_ context.Context, region *tailcfg.DERPRegion) net.Conn { |
There was a problem hiding this comment.
There's a comment above in the code that seems outdated now?
// TODO: This should dial directly to execute the
// DERP server instead of contacting localhost.
//
// This requires modification of Tailscale internals
// to pipe through a proxy function per-region, so
// this is an easy and mostly reliable hack for now.
There was a problem hiding this comment.
Great point! I'm happy we're able to take out a TODO!
Prior to this change, DERP traffic would route from `coderd` to the `CODER_ACCESS_URL` to reach the internal DERP server, which may have resulted in slower connections due to proxying, or the failure of web traffic entirely. If your Coder deployment has a proxy in front of it, your traffic through web terminals, apps, and port-forwarding is about to get a lot faster!
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Prior to this change, DERP traffic would route from
coderdto theCODER_ACCESS_URLto reach the internal DERP server, which may have resulted in slower connections due to proxying, or the failure of web traffic entirely.If your Coder deployment has a proxy in front of it, your traffic through web terminals, apps, and port-forwarding is about to get a lot faster!
See coder/tailscale#13