8000 Fail assigning an ID when creating resources by pedroigor · Pull Request #54603 · keycloak/keycloak · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status;

import org.keycloak.OAuthErrorException;
import org.keycloak.authorization.AuthorizationProvider;
import org.keycloak.authorization.admin.ResourceSetService;
import org.keycloak.authorization.common.KeycloakIdentity;
Expand Down Expand Up @@ -69,6 +70,10 @@ public Response create(UmaResourceRepresentation resource) {
return Response.status(Status.BAD_REQUEST).build();
}

if (resource.getId() != null) {
throw new ErrorResponseException(OAuthErrorException.INVALID_REQUEST, "Resource identifier must not be provided when creating a resource.", Status.BAD_REQUEST);
}

ResourceOwnerRepresentation owner = new ResourceOwnerRepresentation();
owner.setId(identity.getId());
resource.setOwner(owner);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
package org.keycloak.tests.authz.services.uma;

import java.util.List;
import java.util.Map;
import java.util.Set;

import jakarta.ws.rs.core.Response.Status;

import org.keycloak.authorization.client.AuthzClient;
import org.keycloak.authorization.client.Configuration;
import org.keycloak.authorization.client.resource.ProtectionResource;
import org.keycloak.authorization.client.util.HttpResponseException;
import org.keycloak.representations.idm.RoleRepresentation;
import org.keycloak.representations.idm.authorization.ResourceRepresentation;
import org.keycloak.representations.idm.authorization.ResourceServerRepresentation;
import org.keycloak.testframework.annotations.InjectClient;
import org.keycloak.testframework.annotations.InjectHttpClient;
import org.keycloak.testframework.annotations.InjectKeycloakUrls;
import org.keycloak.testframework.annotations.InjectRealm;
import org.keycloak.testframework.annotations.KeycloakIntegrationTest;
import org.keycloak.testframework.injection.LifeCycle;
import org.keycloak.testframework.realm.ClientBuilder;
import org.keycloak.testframework.realm.ClientConfig;
import org.keycloak.testframework.realm.ManagedClient;
import org.keycloak.testframework.realm.ManagedRealm;
import org.keycloak.testframework.realm.RealmBuilder;
import org.keycloak.testframework.realm.RealmConfig;
import org.keycloak.testframework.realm.UserBuilder;
import org.keycloak.testframework.server.KeycloakUrls;

import org.apache.http.client.HttpClient;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;

@KeycloakIntegrationTest
public class ProtectionApiTest {

private static final String RESOURCE_SERVER_ID = "resource-server";

@InjectRealm(config = TestRealmConfig.class, lifecycle = LifeCycle.METHOD)
ManagedRealm realm;

@InjectClient(config = TestResourceServerConfig.class, lifecycle = LifeCycle.METHOD)
ManagedClient resourceServer;

@InjectKeycloakUrls
KeycloakUrls keycloakUrls;

@InjectHttpClient
HttpClient httpClient;

private AuthzClient authzClient;

@BeforeEach
public void enableRemoteResourceManagement() {
RoleRepresentation umaProtectionRole = resourceServer.admin().roles().get("uma_protection").toRepresentation();
for (String username : List.of("alice", "marta")) {
String userId = realm.admin().users().search(username).get(0).getId();
realm.admin().users().get(userId).roles().clientLevel(resourceServer.getId()).add(List.of(umaProtectionRole));
}

ResourceServerRepresentation settings = resourceServer.admin().authorization().getSettings();
settings.setAllowRemoteResourceManagement(true);
resourceServer.admin().authorization().update(settings);

authzClient = AuthzClient.create(new Configuration(keycloakUrls.getBase(), realm.getName(), resourceServer.getClientId(),
Map.of("secret", resourceServer.getSecret()), httpClient));
}

@Test
public void testRejectsClientSuppliedIdWithoutChangingExistingResource() {
ProtectionResource alice = authzClient.protection("alice", "password");
ResourceRepresentation existing = alice.resource().create(new ResourceRepresentation("alice-resource", Set.of()));

ResourceRepresentation registration = new ResourceRepresentation("overwritten-resource", Set.of());
registration.setId(existing.getId());

RuntimeException exception = assertThrows(RuntimeException.class,
() -> authzClient.protection("marta", "password").resource().create(registration));
assertEquals(Status.BAD_REQUEST.getStatusCode(), ((HttpResponseException) exception.getCause()).getStatusCode());
assertEquals("alice-resource", alice.resource().findById(existing.getId()).getName());

ResourceRepresentation created = authzClient.protection("marta", "password").resource()
.create(new ResourceRepresentation("marta-resource", Set.of()));
assertNotNull(created.getId());
}

public static class TestRealmConfig implements RealmConfig {

@Override
public RealmBuilder configure(RealmBuilder realm) {
return realm
.users(UserBuilder.create("alice").name("Alice", "Test").email("alice@example.org").emailVerified(true).password("password"))
.users(UserBuilder.create("marta").name("Marta", "Test").email("marta@example.org").emailVerified(true).password("password"));
}
}

public static class TestResourceServerConfig implements ClientConfig {

@Override
public ClientBuilder configure(ClientBuilder client) {
return client.clientId(RESOURCE_SERVER_ID)
.secret("secret")
.authorizationServicesEnabled(true)
.directAccessGrantsEnabled();
}
}
}
Loading
0