Commit2b307c7

authored

fix(cli/server): do not redirect /healthz (#12080)

1 parent92b2e26 commit2b307c7Copy full SHA for 2b307c7

File tree

+14

-1

lines changed

+14

-1

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1991,6 +1991,13 @@ func redirectToAccessURL(handler http.Handler, accessURL *url.URL, tunnel bool,`
`1991`	`1991`	`http.Redirect(w,r,accessURL.String(),http.StatusTemporaryRedirect)`
`1992`	`1992`	`}`
`1993`	`1993`
	`1994`	`+// Exception: /healthz`
	`1995`	`+// Kubernetes doesn't like it if you redirect your healthcheck or liveness check endpoint.`
	`1996`	`+ifr.URL.Path=="/healthz" {`
	`1997`	`+handler.ServeHTTP(w,r)`
	`1998`	`+return`
	`1999`	`+}`
	`2000`	`+`
`1994`	`2001`	`// Exception: DERP`
`1995`	`2002`	`// We use this endpoint when creating a DERP-mesh in the enterprise version to directly`
`1996`	`2003`	`// dial other Coderd derpers. Redirecting to the access URL breaks direct dial since the`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -685,11 +685,17 @@ func TestServer(t *testing.T) {`
`685`	`685`	`require.Equal(t,c.expectRedirect,resp.Header.Get("Location"))`
`686`	`686`	`}`
`687`	`687`
	`688`	`+// We should never readirect /healthz`
	`689`	`+respHealthz,err:=client.Request(ctx,http.MethodGet,"/healthz",nil)`
	`690`	`+require.NoError(t,err)`
	`691`	`+deferrespHealthz.Body.Close()`
	`692`	`+require.Equal(t,http.StatusOK,respHealthz.StatusCode,"/healthz should never redirect")`
	`693`	`+`
`688`	`694`	`// We should never redirect DERP`
`689`	`695`	`respDERP,err:=client.Request(ctx,http.MethodGet,"/derp",nil)`
`690`	`696`	`require.NoError(t,err)`
`691`	`697`	`deferrespDERP.Body.Close()`
`692`		`-require.Equal(t,http.StatusUpgradeRequired,respDERP.StatusCode)`
	`698`	`+require.Equal(t,http.StatusUpgradeRequired,respDERP.StatusCode,"/derp should never redirect")`
`693`	`699`	`}`
`694`	`700`
`695`	`701`	`// Verify TLS`

Comments

(0)