Skip to content

chore: 404 Requests to workspace proxy direct back to the primary #7353

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 2 commits into from
May 1, 2023
Merged

chore: 404 Requests to workspace proxy direct back to the primary #7353

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0474015
chore: 404 Requests to workspace proxy direct back to the primary
Emyrk May 1, 2023
00162b0
Remove unnecessary sprintf
Emyrk May 1, 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
13 changes: 11 additions & 2 deletions enterprise/wsproxy/wsproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import (
"strings"
"time"

"github.com/coder/coder/coderd/httpapi"

"github.com/go-chi/chi/v5"
"github.com/google/uuid"
"github.com/prometheus/client_golang/prometheus"
Expand All @@ -20,12 +18,14 @@ import (

"cdr.dev/slog"
"github.com/coder/coder/buildinfo"
"github.com/coder/coder/coderd/httpapi"
"github.com/coder/coder/coderd/httpmw"
"github.com/coder/coder/coderd/tracing"
"github.com/coder/coder/coderd/workspaceapps"
"github.com/coder/coder/coderd/wsconncache"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/enterprise/wsproxy/wsproxysdk"
"github.com/coder/coder/site"
)

type Options struct {
Expand Down Expand Up @@ -233,6 +233,15 @@ func New(ctx context.Context, opts *Options) (*Server, error) {
r.Get("/healthz", func(w http.ResponseWriter, r *http.Request) { _, _ = w.Write([]byte("OK")) })
// TODO: @emyrk should this be authenticated or debounced?
r.Get("/healthz-report", s.healthReport)
r.NotFound(func(rw http.ResponseWriter, r *http.Request) {
site.RenderStaticErrorPage(rw, r, site.ErrorPageData{
Status: 404,
Title: "Route Not Found",
Description: fmt.Sprintf("The route you requested does not exist on this workspace proxy. Maybe you intended to make this request to the primary dashboard? Click below to be redirected to the primary site."),
RetryEnabled: false,
DashboardURL: opts.DashboardURL.String(),
})
})

return s, nil
}
Expand Down