Skip to content
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

fix: stricter JSON patch checking for PATCH identities #4263

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+55 −2
Open

fix: stricter JSON patch checking for PATCH identities #4263

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92d6180
fix: stricter JSON patch checking for PATCH identities
hperl Jan 6, 2025
4134830
code review
hperl Jan 7, 2025
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
Next Next commit
fix: stricter JSON patch checking for PATCH identities
  • Loading branch information
@hperl
hperl committed Jan 6, 2025
commit 92d6180cf8e3ed40665f9c1dccaea78cffc343f7
14 changes: 14 additions & 0 deletions identity/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"time"

"github.com/gofrs/uuid"
"github.com/tidwall/gjson"

"github.com/ory/x/crdbx"
"github.com/ory/x/pagination/keysetpagination"
Expand Down Expand Up @@ -916,6 +917,19 @@ func (h *Handler) patch(w http.ResponseWriter, r *http.Request, ps httprouter.Pa

patchedIdentity := WithAdminMetadataInJSON(*identity)

// We need to check for all sub-paths of /credentials, since jsonx.ApplyJSONPatch
// only checks full paths.
for _, path := range gjson.GetBytes(requestBody, "#.path").Array() {
if strings.HasPrefix(path.String(), "/credentials/") {
h.r.Writer().WriteError(w, r, errors.WithStack(
herodot.
ErrBadRequest.
WithReasonf("An error occured when applying the JSON patch").
WithErrorf("patch includes denied sub-path of /credentials: %s", path.String())))
return
}
}

if err := jsonx.ApplyJSONPatch(requestBody, &patchedIdentity, "/id", "/stateChangedAt", "/credentials"); err != nil {
hperl marked this conversation as resolved.
Show resolved Hide resolved
h.r.Writer().WriteError(w, r, errors.WithStack(
herodot.
Expand Down
51 changes: 51 additions & 0 deletions identity/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1203,6 +1203,57 @@ func TestHandler(t *testing.T) {
}
})

t.Run("case=PATCH should fail if credential orgs are updated", func(t *testing.T) {
uuid := x.NewUUID().String()
email := uuid + "@ory.sh"
i := &identity.Identity{Traits: identity.Traits(`{"email":"` + email + `"}`)}
i.SetCredentials(identity.CredentialsTypeOIDC, identity.Credentials{
Type: identity.CredentialsTypeOIDC,
Identifiers: []string{email},
Config: sqlxx.JSONRawMessage(`{"providers": [{"provider": "some-provider"}]}`),
})
require.NoError(t, reg.PrivilegedIdentityPool().CreateIdentity(context.Background(), i))

for name, ts := range map[string]*httptest.Server{"public": publicTS, "admin": adminTS} {
t.Run("endpoint="+name, func(t *testing.T) {
patch := []patch{
{"op": "replace", "path": "/credentials/oidc/config/providers/0/organization", "value": "foo"},
}

res := send(t, ts, "PATCH", "/identities/"+i.ID.String(), http.StatusBadRequest, &patch)

assert.EqualValues(t, "patch includes denied sub-path of /credentials: /credentials/oidc/config/providers/0/organization", res.Get("error.message").String(), "%s", res.Raw)
})
}
})

t.Run("case=PATCH should fail to update credential password", func(t *testing.T) {
uuid := x.NewUUID().String()
email := uuid + "@ory.sh"
password := "ljanf123akf"
p, err := reg.Hasher(ctx).Generate(context.Background(), []byte(password))
require.NoError(t, err)
i := &identity.Identity{Traits: identity.Traits(`{"email":"` + email + `"}`)}
i.SetCredentials(identity.CredentialsTypePassword, identity.Credentials{
Type: identity.CredentialsTypePassword,
Identifiers: []string{email},
Config: sqlxx.JSONRawMessage(`{"hashed_password":"` + string(p) + `"}`),
})
require.NoError(t, reg.PrivilegedIdentityPool().CreateIdentity(context.Background(), i))

for name, ts := range map[string]*httptest.Server{"public": publicTS, "admin": adminTS} {
t.Run("endpoint="+name, func(t *testing.T) {
patch := []patch{
{"op": "replace", "path": "/credentials/password/config/hashed_password", "value": "foo"},
}

res := send(t, ts, "PATCH", "/identities/"+i.ID.String(), http.StatusBadRequest, &patch)

assert.EqualValues(t, "patch includes denied sub-path of /credentials: /credentials/password/config/hashed_password", res.Get("error.message").String(), "%s", res.Raw)
})
}
})

t.Run("case=PATCH should not invalidate credentials ory/cloud#148", func(t *testing.T) {
// see https://github.com/ory/cloud/issues/148

Expand Down
Loading