Skip to content

Enforce resource server predicates if one was given despite the IS_ADMIN flag #48385

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
pedroigor wants to merge 1 commit into
base: main
Choose a base branch
from
+125 −14
Open

Enforce resource server predicates if one was given despite the IS_ADMIN flag #48385

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
31 changes: 17 additions & 14 deletions model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPermissionTicketStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,24 +87,27 @@ private List<Predicate> getPredicates(CriteriaBuilder builder,
List<Predicate> predicates = new ArrayList<>();
KeycloakSession session = provider.getKeycloakSession();

if (resourceServer != null && !Boolean.parseBoolean(attributes.get(PermissionTicket.FilterOption.IS_ADMIN))) {
if (resourceServer != null) {
predicates.add(builder.equal(root.get("resourceServer").get("id"), resourceServer.getId()));
ClientModel resourceServerClient = session.clients().getClientById(session.getContext().getRealm(), resourceServer.getClientId());
UserModel currentUser = session.getContext().getUser();

if (resourceServerClient.isServiceAccountsEnabled()) {
UserModel serviceAccount = session.users().getServiceAccount(resourceServerClient);
if (!Boolean.parseBoolean(attributes.get(PermissionTicket.FilterOption.IS_ADMIN))) {
ClientModel resourceServerClient = session.clients().getClientById(session.getContext().getRealm(), resourceServer.getClientId());
UserModel currentUser = session.getContext().getUser();

if (serviceAccount != null && serviceAccount.equals(currentUser)) {
currentUser = null;
if (resourceServerClient.isServiceAccountsEnabled()) {
UserModel serviceAccount = session.users().getServiceAccount(resourceServerClient);

if (serviceAccount != null && serviceAccount.equals(currentUser)) {
currentUser = null;
}
}
}

if (currentUser != null) {
predicates.add(builder.or(
builder.equal(root.get("owner"), currentUser.getId()),
builder.equal(root.get("requester"), currentUser.getId())
));
if (currentUser != null) {
predicates.add(builder.or(
builder.equal(root.get("owner"), currentUser.getId()),
builder.equal(root.get("requester"), currentUser.getId())
));
}
}
}

Expand Down Expand Up @@ -190,7 +193,7 @@ public PermissionTicket findById(ResourceServer resourceServer, String id) {

PermissionTicketEntity entity = entityManager.find(PermissionTicketEntity.class, id);

if (entity == null || !resourceServer.getId().equals(entity.getResourceServer().getId())) {
if (entity == null || (resourceServer != null && !resourceServer.getId().equals(entity.getResourceServer().getId()))) {
return null;
}

Expand Down
108 changes: 108 additions & 0 deletions ...llian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionManagementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,4 +511,112 @@ public void testPermissionCount() throws Exception {
Long ticketCount = getAuthzClient().protection().permission().count(resource.getId(), null, null, null, null, true);
assertEquals(Long.valueOf(4), ticketCount, "Returned number of permissions tickets must match the amount of permission tickets.");
}

@Test
public void testISAdminFilterRespectsResourceServer() {
// create a second resource server
getRealm().clients().create(
org.keycloak.testsuite.util.ClientBuilder.create()
.clientId("resource-server-test-2")
.secret("secret")
.authorizationServicesEnabled(true)
.redirectUris("http://localhost/resource-server-test-2")
.defaultRoles("uma_protection")
.directAccessGrants()
.serviceAccountsEnabled(true)
.build()
).close();

testingClient.server().run(session -> {
org.keycloak.models.RealmModel realm = session.realms().getRealmByName("authz-test");
session.getContext().setRealm(realm);
org.keycloak.authorization.AuthorizationProvider authorization =
session.getProvider(org.keycloak.authorization.AuthorizationProvider.class);
org.keycloak.authorization.store.StoreFactory storeFactory = authorization.getStoreFactory();
org.keycloak.authorization.store.PermissionTicketStore ticketStore =
storeFactory.getPermissionTicketStore();

org.keycloak.models.ClientModel client1 = session.clients()
.getClientByClientId(realm, "resource-server-test");
org.keycloak.authorization.model.ResourceServer rs1 =
storeFactory.getResourceServerStore().findByClient(client1);

org.keycloak.models.ClientModel client2 = session.clients()
.getClientByClientId(realm, "resource-server-test-2");
org.keycloak.authorization.model.ResourceServer rs2 =
storeFactory.getResourceServerStore().findByClient(client2);

org.keycloak.authorization.model.Resource resource1 =
storeFactory.getResourceStore().create(rs1, "resource-rs1", client1.getId());
org.keycloak.authorization.model.Resource resource2 =
storeFactory.getResourceStore().create(rs2, "resource-rs2", client2.getId());

String requester = session.users().getUserByUsername(realm, "marta").getId();

org.keycloak.authorization.model.PermissionTicket ticket1 =
ticketStore.create(rs1, resource1, null, requester);
ticket1.setGrantedTimestamp(System.currentTimeMillis());

org.keycloak.authorization.model.PermissionTicket ticket2 =
ticketStore.create(rs2, resource2, null, requester);
ticket2.setGrantedTimestamp(System.currentTimeMillis());

java.util.Map<org.keycloak.authorization.model.PermissionTicket.FilterOption, String> filters =
new java.util.EnumMap<>(org.keycloak.authorization.model.PermissionTicket.FilterOption.class);
filters.put(org.keycloak.authorization.model.PermissionTicket.FilterOption.IS_ADMIN, "true");
filters.put(org.keycloak.authorization.model.PermissionTicket.FilterOption.GRANTED, "true");

java.util.List<org.keycloak.authorization.model.PermissionTicket> rs1Tickets =
ticketStore.find(rs1, filters, null, null);
java.util.List<org.keycloak.authorization.model.PermissionTicket> rs2Tickets =
ticketStore.find(rs2, filters, null, null);

assertEquals(1, rs1Tickets.size());
assertEquals(rs1.getId(), rs1Tickets.get(0).getResourceServer().getId());

assertEquals(1, rs2Tickets.size());
assertEquals(rs2.getId(), rs2Tickets.get(0).getResourceServer().getId());
});

testingClient.server().run(session -> {
org.keycloak.models.RealmModel realm = session.realms().getRealmByName("authz-test");
session.getContext().setRealm(realm);
org.keycloak.authorization.AuthorizationProvider authorization =
session.getProvider(org.keycloak.authorization.AuthorizationProvider.class);
org.keycloak.authorization.store.StoreFactory storeFactory = authorization.getStoreFactory();
org.keycloak.authorization.store.PermissionTicketStore ticketStore =
storeFactory.getPermissionTicketStore();
org.keycloak.models.ClientModel client1 = session.clients()
.getClientByClientId(realm, "resource-server-test");
org.keycloak.authorization.model.ResourceServer rs1 =
storeFactory.getResourceServerStore().findByClient(client1);

org.keycloak.models.ClientModel client2 = session.clients()
.getClientByClientId(realm, "resource-server-test-2");
org.keycloak.authorization.model.ResourceServer rs2 =
storeFactory.getResourceServerStore().findByClient(client2);
java.util.Map<org.keycloak.authorization.model.PermissionTicket.FilterOption, String> filters =
new java.util.EnumMap<>(org.keycloak.authorization.model.PermissionTicket.FilterOption.class);
filters.put(org.keycloak.authorization.model.PermissionTicket.FilterOption.IS_ADMIN, "true");
filters.put(org.keycloak.authorization.model.PermissionTicket.FilterOption.GRANTED, "true");

java.util.List<org.keycloak.authorization.model.PermissionTicket> rs1Tickets =
ticketStore.find(rs1, filters, null, null);
java.util.List<org.keycloak.authorization.model.PermissionTicket> rs2Tickets =
ticketStore.find(rs2, filters, null, null);

assertEquals(1, rs1Tickets.size());
assertEquals(rs1.getId(), rs1Tickets.get(0).getResourceServer().getId());

assertEquals(1, rs2Tickets.size());
assertEquals(rs2.getId(), rs2Tickets.get(0).getResourceServer().getId());

rs1Tickets =
ticketStore.find(null, filters, null, null);
assertEquals(2, rs1Tickets.size());
rs2Tickets =
ticketStore.find(null, filters, null, null);
assertEquals(2, rs2Tickets.size());
});
}
}
Loading