Skip to content

feat: add flag to disable all direct connections instance-wide #7936

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Jun 21, 2023
Merged

feat: add flag to disable all direct connections instance-wide #7936

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4657899
feat: add flag to disable all direct connections
deansheather Jun 9, 2023
f17bee7
block coderd -> workspace direct too
deansheather Jun 9, 2023
76e2200
z
deansheather Jun 10, 2023
43f12cd
fixup! z
deansheather Jun 10, 2023
c444a41
Merge branch 'main' into dean/disable-direct
deansheather Jun 10, 2023
aa3cdda
fixup! Merge branch 'main' into dean/disable-direct
deansheather Jun 10, 2023
e4da9fc
Merge branch 'main' into dean/disable-direct
deansheather Jun 13, 2023
bd107bc
rename flag and fields
deansheather Jun 21, 2023
9e7c5e1
fixup! rename flag and fields
deansheather Jun 21, 2023
f70642b
Merge branch 'main' into dean/disable-direct
deansheather Jun 21, 2023
92fdc5e
fixup! Merge branch 'main' into dean/disable-direct
deansheather Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
block coderd -> workspace direct too
  • Loading branch information
@deansheather
deansheather committed Jun 9, 2023
commit f17bee74595f1b8c999e561e119d5df010d0fa94
7 changes: 4 additions & 3 deletions coderd/workspaceagents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,9 +664,10 @@ func (api *API) workspaceAgentListeningPorts(rw http.ResponseWriter, r *http.Req
func (api *API) dialWorkspaceAgentTailnet(agentID uuid.UUID) (*codersdk.WorkspaceAgentConn, error) {
clientConn, serverConn := net.Pipe()
conn, err := tailnet.NewConn(&tailnet.Options{
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(), 128)},
DERPMap: api.DERPMap,
Logger: api.Logger.Named("tailnet"),
Addresses: []netip.Prefix{netip.PrefixFrom(tailnet.IP(), 128)},
DERPMap: api.DERPMap,
Logger: api.Logger.Named("tailnet"),
BlockEndpoints: api.DeploymentValues.DERP.Config.DisableDirect.Value(),
})
if err != nil {
_ = clientConn.Close()
Expand Down