Commit900e2cd

authored

chore: implement better 404 for unimplemented scim endpoints (#15232)

Prior to this, html was returned.

1 parent487b37b commit900e2cdCopy full SHA for 900e2cd

File tree

+10

-14

lines changed

+10

-14

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@ func New(ctx context.Context, options Options) (_ API, err error) {`
`455`	`455`	`iflen(options.SCIMAPIKey)!=0 {`
`456`	`456`	`api.AGPL.RootHandler.Route("/scim/v2",func(r chi.Router) {`
`457`	`457`	`r.Use(`
`458`		`-api.scimEnabledMW,`
	`458`	`+api.RequireFeatureMW(codersdk.FeatureSCIM),`
`459`	`459`	`)`
`460`	`460`	`r.Post("/Users",api.scimPostUser)`
`461`	`461`	`r.Route("/Users",func(r chi.Router) {`
`@@ -464,6 +464,13 @@ func New(ctx context.Context, options Options) (_ API, err error) {`
`464`	`464`	`r.Get("/{id}",api.scimGetUser)`
`465`	`465`	`r.Patch("/{id}",api.scimPatchUser)`
`466`	`466`	`})`
	`467`	`+r.NotFound(func(w http.ResponseWriter,r*http.Request) {`
	`468`	`+u:=r.URL.String()`
	`469`	`+httpapi.Write(r.Context(),w,http.StatusNotFound, codersdk.Response{`
	`470`	`+Message:fmt.Sprintf("SCIM endpoint %s not found",u),`
	`471`	`+Detail:"This endpoint is not implemented. If it is correct and required, please contact support.",`
	`472`	`+})`
	`473`	`+})`
`467`	`474`	`})`
`468`	`475`	`}else {`
`469`	`476`	`// Show a helpful 404 error. Because this is not under the /api/v2 routes,`

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,17 +23,6 @@ import (`
`23`	`23`	`"github.com/coder/coder/v2/codersdk"`
`24`	`24`	`)`
`25`	`25`
`26`		`-func (api*API)scimEnabledMW(next http.Handler) http.Handler {`
`27`		`-returnhttp.HandlerFunc(func(rw http.ResponseWriter,r*http.Request) {`
`28`		`-if!api.Entitlements.Enabled(codersdk.FeatureSCIM) {`
`29`		`-httpapi.RouteNotFound(rw)`
`30`		`-return`
`31`		`-}`
`32`		`-`
`33`		`-next.ServeHTTP(rw,r)`
`34`		`-})`
`35`		`-}`
`36`		`-`
`37`	`26`	`func (apiAPI)scimVerifyAuthHeader(rhttp.Request)bool {`
`38`	`27`	`bearer:= []byte("Bearer ")`
`39`	`28`	`hdr:= []byte(r.Header.Get("Authorization"))`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func TestScim(t *testing.T) {`
`88`	`88`	`res,err:=client.Request(ctx,"POST","/scim/v2/Users",struct{}{})`
`89`	`89`	`require.NoError(t,err)`
`90`	`90`	`deferres.Body.Close()`
`91`		`-assert.Equal(t,http.StatusNotFound,res.StatusCode)`
	`91`	`+assert.Equal(t,http.StatusForbidden,res.StatusCode)`
`92`	`92`	`})`
`93`	`93`
`94`	`94`	`t.Run("noAuth",func(t*testing.T) {`
`@@ -424,7 +424,7 @@ func TestScim(t *testing.T) {`
`424`	`424`	`require.NoError(t,err)`
`425`	`425`	`_,_=io.Copy(io.Discard,res.Body)`
`426`	`426`	`_=res.Body.Close()`
`427`		`-assert.Equal(t,http.StatusNotFound,res.StatusCode)`
	`427`	`+assert.Equal(t,http.StatusForbidden,res.StatusCode)`
`428`	`428`	`})`
`429`	`429`
`430`	`430`	`t.Run("noAuth",func(t*testing.T) {`

Comments

(0)