Skip to content

Reject invalid resource IDs in permission creation #47406

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

Merged
pedroigor merged 1 commit into from
Mar 24, 2026
Merged

Reject invalid resource IDs in permission creation #47406

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
2 changes: 1 addition & 1 deletion server-spi-private/src/main/java/org/keycloak/authorization/AuthorizationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ public Policy create(ResourceServer resourceServer, AbstractPolicyRepresentation

if (resources != null && !resources.isEmpty()) {
representation.setResources(resources.stream().map(id -> {
Resource resource = AdminPermissionsSchema.SCHEMA.getOrCreateResource(keycloakSession, resourceServer, representation.getType(), representation.getResourceType(), id);
Resource resource = AdminPermissionsSchema.SCHEMA.getOrCreateResource(keycloakSession, resourceServer, representation.getResourceType(), id);

if (resource == null) {
resource = storeFactory.getResourceStore().findById(resourceServer, id);
Expand Down
14 changes: 9 additions & 5 deletions server-spi-private/src/main/java/org/keycloak/authorization/fgap/AdminPermissionsSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ private AdminPermissionsSchema() {
));
}

public Resource getOrCreateResource(KeycloakSession session, ResourceServer resourceServer, String policyType, String resourceType, String id) {
public Resource getOrCreateResource(KeycloakSession session, ResourceServer resourceServer, String resourceType, String id) {
if (!supportsAuthorizationSchema(session, resourceServer)) {
return null;
}
Expand All @@ -139,10 +139,14 @@ public Resource getOrCreateResource(KeycloakSession session, ResourceServer reso
String name;

switch (resourceType) {
case CLIENTS_RESOURCE_TYPE -> name = resolveClient(session, id).map(ClientModel::getId).orElse(resourceType);
case GROUPS_RESOURCE_TYPE -> name = resolveGroup(session, id).map(GroupModel::getId).orElse(resourceType);
case ROLES_RESOURCE_TYPE -> name = resolveRole(session, id).map(RoleModel::getId).orElse(resourceType);
case USERS_RESOURCE_TYPE -> name = resolveUser(session, id).map(UserModel::getId).orElse(resourceType);
case CLIENTS_RESOURCE_TYPE -> name = resolveClient(session, id).map(ClientModel::getId)
.orElseThrow(() -> new ModelValidationException("Resource [" + id + "] does not exist for type [" + resourceType + "]"));
case GROUPS_RESOURCE_TYPE -> name = resolveGroup(session, id).map(GroupModel::getId)
.orElseThrow(() -> new ModelValidationException("Resource [" + id + "] does not exist for type [" + resourceType + "]"));
case ROLES_RESOURCE_TYPE -> name = resolveRole(session, id).map(RoleModel::getId)
.orElseThrow(() -> new ModelValidationException("Resource [" + id + "] does not exist for type [" + resourceType + "]"));
case USERS_RESOURCE_TYPE -> name = resolveUser(session, id).map(UserModel::getId)
.orElseThrow(() -> new ModelValidationException("Resource [" + id + "] does not exist for type [" + resourceType + "]"));

default -> throw new IllegalStateException("Resource type [" + resourceType + "] not found.");
}
Expand Down
2 changes: 1 addition & 1 deletion server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1458,7 +1458,7 @@ private static void updateResources(AbstractPolicyRepresentation representation,
}

resourceIds = resourceIds.stream().map(id -> {
Resource resource = AdminPermissionsSchema.SCHEMA.getOrCreateResource(session, resourceServer, policy.getType(), policy.getResourceType(), id);
Resource resource = AdminPermissionsSchema.SCHEMA.getOrCreateResource(session, resourceServer, policy.getResourceType(), id);

if (resource == null) {
return id;
Expand Down
25 changes: 25 additions & 0 deletions tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/PermissionRESTTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,31 @@ public void permissionsTest() {
.resourceType(AdminPermissionsSchema.USERS.getType())
.scopes(Set.of("edit", "write", "token-exchange"))
.build(), Response.Status.BAD_REQUEST);

// valid resourceType, valid scopes, non-existent resource ID
createPermission(client, PermissionBuilder.create()
.resourceType(AdminPermissionsSchema.USERS.getType())
.resources(Set.of("non-existent-id"))
.scopes(AdminPermissionsSchema.USERS.getScopes())
.build(), Response.Status.BAD_REQUEST);

createPermission(client, PermissionBuilder.create()
.resourceType(AdminPermissionsSchema.GROUPS.getType())
.resources(Set.of("non-existent-id"))
.scopes(AdminPermissionsSchema.GROUPS.getScopes())
.build(), Response.Status.BAD_REQUEST);

createPermission(client, PermissionBuilder.create()
.resourceType(AdminPermissionsSchema.CLIENTS.getType())
.resources(Set.of("non-existent-id"))
.scopes(AdminPermissionsSchema.CLIENTS.getScopes())
.build(), Response.Status.BAD_REQUEST);

createPermission(client, PermissionBuilder.create()
.resourceType(AdminPermissionsSchema.ROLES.getType())
.resources(Set.of("non-existent-id"))
.scopes(AdminPermissionsSchema.ROLES.getScopes())
.build(), Response.Status.BAD_REQUEST);
}

@Test
Expand Down
Loading