mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
chore: return json for disabled scim routes (#15222)
Customers reporting html pages returned to SCIM. Likely a disabled SCIM. We should just report a more consumable error by the SCIM provider. Previous behavior was a status code 200 HTML page
This commit is contained in:
@@ -465,6 +465,18 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
|
||||
r.Patch("/{id}", api.scimPatchUser)
|
||||
})
|
||||
})
|
||||
} else {
|
||||
// Show a helpful 404 error. Because this is not under the /api/v2 routes,
|
||||
// the frontend is the fallback. A html page is not a helpful error for
|
||||
// a SCIM provider. This JSON has a call to action that __may__ resolve
|
||||
// the issue.
|
||||
// Using Mount to cover all subroute possibilities.
|
||||
api.AGPL.RootHandler.Mount("/scim/v2", http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
httpapi.Write(r.Context(), w, http.StatusNotFound, codersdk.Response{
|
||||
Message: "SCIM is disabled, please contact your administrator if you believe this is an error",
|
||||
Detail: "SCIM endpoints are disabled if no SCIM is configured. Configure 'CODER_SCIM_AUTH_HEADER' to enable.",
|
||||
})
|
||||
})))
|
||||
}
|
||||
|
||||
meshTLSConfig, err := replicasync.CreateDERPMeshTLSConfig(options.AccessURL.Hostname(), options.TLSCertificates)
|
||||
|
||||
@@ -3,6 +3,7 @@ package coderd_test
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
@@ -503,6 +504,46 @@ func TestMultiReplica_EmptyRelayAddress_DisabledDERP(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestSCIMDisabled(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
cli, _ := coderdenttest.New(t, &coderdenttest.Options{})
|
||||
|
||||
checkPaths := []string{
|
||||
"/scim/v2",
|
||||
"/scim/v2/",
|
||||
"/scim/v2/users",
|
||||
"/scim/v2/Users",
|
||||
"/scim/v2/Users/",
|
||||
"/scim/v2/random/path/that/is/long",
|
||||
"/scim/v2/random/path/that/is/long.txt",
|
||||
}
|
||||
|
||||
for _, p := range checkPaths {
|
||||
p := p
|
||||
t.Run(p, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
u, err := cli.URL.Parse(p)
|
||||
require.NoError(t, err)
|
||||
|
||||
req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, u.String(), nil)
|
||||
require.NoError(t, err)
|
||||
|
||||
resp, err := http.DefaultClient.Do(req)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
require.Equal(t, http.StatusNotFound, resp.StatusCode)
|
||||
|
||||
var apiError codersdk.Response
|
||||
err = json.NewDecoder(resp.Body).Decode(&apiError)
|
||||
require.NoError(t, err)
|
||||
|
||||
require.Contains(t, apiError.Message, "SCIM is disabled")
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// testDBAuthzRole returns a context with a subject that has a role
|
||||
// with permissions required for test setup.
|
||||
func testDBAuthzRole(ctx context.Context) context.Context {
|
||||
|
||||
Reference in New Issue
Block a user