synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:/coder/coder into dk/prebuilds

Browse Source
This commit is contained in:
Danny Kopping
2025-02-21 08:24:15 +00:00
parent 473d53a870 d50e846747
commit 159b3ae7ab
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
coderd/workspaceagents.go
View File

@ -907,6 +907,7 @@ func (api *API) workspaceAgentClientCoordinate(rw http.ResponseWriter, r *http.R
} }
// This is used by Enterprise code to control the functionality of this route. // This is used by Enterprise code to control the functionality of this route.
// Namely, disabling the route using `CODER_BROWSER_ONLY`.
override := api.WorkspaceClientCoordinateOverride.Load() override := api.WorkspaceClientCoordinateOverride.Load()
if override != nil { if override != nil {
overrideFunc := *override overrideFunc := *override
@ -1676,6 +1677,16 @@ func (api *API) workspaceAgentsExternalAuthListen(ctx context.Context, rw http.R
func (api *API) tailnetRPCConn(rw http.ResponseWriter, r *http.Request) { func (api *API) tailnetRPCConn(rw http.ResponseWriter, r *http.Request) {
ctx := r.Context() ctx := r.Context()
// This is used by Enterprise code to control the functionality of this route.
// Namely, disabling the route using `CODER_BROWSER_ONLY`.
override := api.WorkspaceClientCoordinateOverride.Load()
if override != nil {
overrideFunc := *override
if overrideFunc != nil && overrideFunc(rw) {
return
}
}
version := "2.0" version := "2.0"
qv := r.URL.Query().Get("version") qv := r.URL.Query().Get("version")
if qv != "" { if qv != "" {