Skip to content

Fix NPE in SCIM PATCH when request body contains "schemas": null #51173

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

Open
sergioperezcheco wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −1
Open

Fix NPE in SCIM PATCH when request body contains "schemas": null #51173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion scim/services/src/main/java/org/keycloak/scim/services/ScimResourceTypeResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.io.InputStream;
import java.time.Instant;
import java.util.List;
import java.util.Set;
import java.util.function.BiFunction;
import java.util.stream.Stream;

Expand Down Expand Up @@ -223,7 +224,8 @@ public Response patch(@PathParam("id") String id, PatchRequest request) {
return resourceNotFound(id);
}

if (!request.getSchemas().contains(Scim.PATCH_OP_CORE_SCHEMA)) {
Set<String> schemas = request.getSchemas();
if (schemas == null || !schemas.contains(Scim.PATCH_OP_CORE_SCHEMA)) {
return invalidSyntax("No PATCH op schema provided in request");
}

Expand Down
21 changes: 21 additions & 0 deletions scim/tests/base/src/test/java/org/keycloak/tests/scim/tck/UserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,27 @@ public void testPatchAdd() {
assertEquals("Amanda", actual.getFirstName());
}

@Test
public void testPatchWithNullSchemas() {
User expected = client.users().create(createUser());

// a PATCH request body carrying "schemas": null deserializes the schemas set to null,
// which must yield a 400 invalidSyntax response rather than a NullPointerException
PatchRequest request = PatchRequest.create()
.add("active", "false")
.build();
request.setSchemas(null);

try {
client.users().patch(expected.getId(), request);
fail("should fail because the PATCH op schema is missing");
} catch (ScimClientException sce) {
ErrorResponse error = sce.getError();
assertNotNull(error);
assertEquals(400, error.getStatusInt());
}
}

@Test
public void testPatchReplace() {
User expected = client.users().create(createUser());
Expand Down