Commit07608fc

and

authored

chore: fix proxy 404 page (#7421)

* chore: fix proxy 404 page---------Co-authored-by: Kyle Carberry <kyle@coder.com>

1 parent2624ee8 commit07608fcCopy full SHA for 07608fc

File tree

+47

-6

lines changed

+47

-6

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -235,9 +235,11 @@ func New(ctx context.Context, opts Options) (Server, error) {`
`235`	`235`	`r.Get("/healthz-report",s.healthReport)`
`236`	`236`	`r.NotFound(func(rw http.ResponseWriter,r*http.Request) {`
`237`	`237`	`site.RenderStaticErrorPage(rw,r, site.ErrorPageData{`
`238`		`-Status:404,`
`239`		`-Title:"Route Not Found",`
`240`		`-Description:"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.",`
	`238`	`+Title:"Head to the Dashboard",`
	`239`	`+Status:http.StatusBadRequest,`
	`240`	`+HideStatus:true,`
	`241`	`+Description:"Workspace Proxies route traffic in terminals and apps directly to your workspace. "+`
	`242`	`+"This page must be loaded from the dashboard. Click to be redirected!",`
`241`	`243`	`RetryEnabled:false,`
`242`	`244`	`DashboardURL:opts.DashboardURL.String(),`
`243`	`245`	`})`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,9 @@ func extractBin(dest string, r io.Reader) (numExtracted int, err error) {`
`606`	`606`	`// ErrorPageData contains the variables that are found in`
`607`	`607`	`// site/static/error.html.`
`608`	`608`	`typeErrorPageDatastruct {`
`609`		`-Statusint`
	`609`	`+Statusint`
	`610`	`+// HideStatus will remove the status code from the page.`
	`611`	`+HideStatusbool`
`610`	`612`	`Titlestring`
`611`	`613`	`Descriptionstring`
`612`	`614`	`RetryEnabledbool`

Lines changed: 31 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -517,3 +517,34 @@ func TestRenderStaticErrorPage(t *testing.T) {`
`517`	`517`	`require.Contains(t,bodyStr,"Retry")`
`518`	`518`	`require.Contains(t,bodyStr,d.DashboardURL)`
`519`	`519`	`}`
	`520`	`+`
	`521`	`+funcTestRenderStaticErrorPageNoStatus(t*testing.T) {`
	`522`	`+t.Parallel()`
	`523`	`+`
	`524`	`+d:= site.ErrorPageData{`
	`525`	`+HideStatus:true,`
	`526`	`+Status:http.StatusBadGateway,`
	`527`	`+Title:"Bad Gateway 1234",`
	`528`	`+Description:"shout out colin",`
	`529`	`+RetryEnabled:true,`
	`530`	`+DashboardURL:"https://example.com",`
	`531`	`+}`
	`532`	`+`
	`533`	`+rw:=httptest.NewRecorder()`
	`534`	`+r:=httptest.NewRequest("GET","/",nil)`
	`535`	`+site.RenderStaticErrorPage(rw,r,d)`
	`536`	`+`
	`537`	`+resp:=rw.Result()`
	`538`	`+deferresp.Body.Close()`
	`539`	`+require.Equal(t,d.Status,resp.StatusCode)`
	`540`	`+require.Contains(t,resp.Header.Get("Content-Type"),"text/html")`
	`541`	`+`
	`542`	`+body,err:=io.ReadAll(resp.Body)`
	`543`	`+require.NoError(t,err)`
	`544`	`+bodyStr:=string(body)`
	`545`	`+require.NotContains(t,bodyStr,strconv.Itoa(d.Status))`
	`546`	`+require.Contains(t,bodyStr,d.Title)`
	`547`	`+require.Contains(t,bodyStr,d.Description)`
	`548`	`+require.Contains(t,bodyStr,"Retry")`
	`549`	`+require.Contains(t,bodyStr,d.DashboardURL)`
	`550`	`+}`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,10 @@`
`7`	`7`	`<metacharset="UTF-8"/>`
`8`	`8`	`<metahttp-equiv="X-UA-Compatible"content="IE=edge"/>`
`9`	`9`	`<metaname="viewport"content="width=device-width, initial-scale=1.0"/>`
`10`		`-<title>{{ .Error.Status }} - {{ .Error.Title }}</title>`
	`10`	`+<title>`
	`11`	`+ {{- if not .Error.HideStatus }}{{ .Error.Status }} - {{end}}{{`
	`12`	`+ .Error.Title }}`
	`13`	`+</title>`
`11`	`14`	`<style>`
`12`	`15`	`* {`
`13`	`16`	`padding:0;`
`@@ -123,7 +126,10 @@`
`123`	`126`	`</defs>`
`124`	`127`	`</svg>`
`125`	`128`
`126`		`-<h1>{{ .Error.Status }} - {{ .Error.Title }}</h1>`
	`129`	`+<h1>`
	`130`	`+ {{- if not .Error.HideStatus }}{{ .Error.Status }} - {{end}}{{`
	`131`	`+ .Error.Title }}`
	`132`	`+</h1>`
`127`	`133`	`<p>{{ .Error.Description }}</p>`
`128`	`134`	`<divclass="button-group">`
`129`	`135`	`{{- if .Error.RetryEnabled }}`

Comments

(0)