From 5e31ce0d9b4f2c28e9cd699e9130b6216ab1657f Mon Sep 17 00:00:00 2001 From: Sebastian Schuster Date: Mon, 8 Aug 2022 18:45:07 +0200 Subject: [PATCH 1/2] 13647 fixed wrong feature flag for checking admin fine-grained authz --- .../admin/permissions/GroupPermissions.java | 2 +- .../admin/permissions/MgmtPermissions.java | 6 +++--- .../admin/permissions/UserPermissions.java | 2 +- .../BrokerLinkAndTokenExchangeTest.java | 6 +----- .../admin/FineGrainAdminUnitTest.java | 7 ------- .../admin/ManagementPermissionsTest.java | 9 ++------- .../keycloak/testsuite/admin/UsersTest.java | 20 +++++++------------ .../oauth/ClientTokenExchangeSAML2Test.java | 9 +-------- .../oauth/ClientTokenExchangeTest.java | 9 +-------- 9 files changed, 17 insertions(+), 53 deletions(-) diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissions.java index e99cbf0d7dc4..382ec2c0b6a4 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissions.java @@ -61,7 +61,7 @@ class GroupPermissions implements GroupPermissionEvaluator, GroupPermissionManag GroupPermissions(AuthorizationProvider authz, MgmtPermissions root) { this.authz = authz; this.root = root; - if (Profile.isFeatureEnabled(Profile.Feature.AUTHORIZATION)) { + if (Profile.isFeatureEnabled(Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ)) { resourceStore = authz.getStoreFactory().getResourceStore(); policyStore = authz.getStoreFactory().getPolicyStore(); } else { diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/MgmtPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/permissions/MgmtPermissions.java index 72a2cdc4dd1b..772c4d4928d1 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/MgmtPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/permissions/MgmtPermissions.java @@ -73,7 +73,7 @@ class MgmtPermissions implements AdminPermissionEvaluator, AdminPermissionManage this.session = session; this.realm = realm; KeycloakSessionFactory keycloakSessionFactory = session.getKeycloakSessionFactory(); - if (Profile.isFeatureEnabled(Profile.Feature.AUTHORIZATION)) { + if (Profile.isFeatureEnabled(Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ)) { AuthorizationProviderFactory factory = (AuthorizationProviderFactory) keycloakSessionFactory.getProviderFactory(AuthorizationProvider.class); this.authz = factory.create(session, realm); } @@ -251,7 +251,7 @@ public ResourceServer resourceServer(ClientModel client) { @Override public ResourceServer realmResourceServer() { - if (!Profile.isFeatureEnabled(Profile.Feature.AUTHORIZATION)) return null; + if (!Profile.isFeatureEnabled(Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ)) return null; if (realmResourceServer != null) return realmResourceServer; ClientModel client = getRealmManagementClient(); if (client == null) return null; @@ -262,7 +262,7 @@ public ResourceServer realmResourceServer() { } public ResourceServer initializeRealmResourceServer() { - if (!Profile.isFeatureEnabled(Profile.Feature.AUTHORIZATION)) return null; + if (!Profile.isFeatureEnabled(Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ)) return null; if (realmResourceServer != null) return realmResourceServer; ClientModel client = getRealmManagementClient(); realmResourceServer = authz.getStoreFactory().getResourceServerStore().findByClient(client); diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissions.java index fc5aa8d4825a..1154894390f1 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissions.java @@ -83,7 +83,7 @@ class UserPermissions implements UserPermissionEvaluator, UserPermissionManageme this.session = session; this.authz = authz; this.root = root; - if (Profile.isFeatureEnabled(Profile.Feature.AUTHORIZATION)) { + if (Profile.isFeatureEnabled(Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ)) { policyStore = authz.getStoreFactory().getPolicyStore(); resourceStore = authz.getStoreFactory().getResourceStore(); } else { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java index 0582cd1a707f..4745c90f4993 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java @@ -97,6 +97,7 @@ @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) @EnableFeature(value = Profile.Feature.TOKEN_EXCHANGE, skipRestart = true) +@EnableFeature(value = Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, skipRestart = true) public class BrokerLinkAndTokenExchangeTest extends AbstractServletsAdapterTest { public static final String CHILD_IDP = "child"; public static final String PARENT_IDP = "parent-idp"; @@ -106,11 +107,6 @@ public class BrokerLinkAndTokenExchangeTest extends AbstractServletsAdapterTest public static final String UNAUTHORIZED_CHILD_CLIENT = "unauthorized-child-client"; public static final String PARENT_CLIENT = "parent-client"; - @BeforeClass - public static void enabled() { - ProfileAssume.assumeFeatureEnabled(Profile.Feature.AUTHORIZATION); - } - @Deployment(name = ClientApp.DEPLOYMENT_NAME) protected static WebArchive accountLink() { return servletDeployment(ClientApp.DEPLOYMENT_NAME, LinkAndExchangeServlet.class, ServletTestUtils.class); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java index a83400f99c36..03ac0868ff65 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java @@ -18,7 +18,6 @@ import org.hamcrest.Matchers; import org.junit.Assert; -import org.junit.BeforeClass; import org.junit.Test; import org.keycloak.admin.client.Keycloak; import org.keycloak.authorization.AuthorizationProvider; @@ -53,7 +52,6 @@ import org.keycloak.services.resources.admin.permissions.ClientPermissionManagement; import org.keycloak.services.resources.admin.permissions.GroupPermissionManagement; import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.auth.page.AuthRealm; @@ -88,11 +86,6 @@ public class FineGrainAdminUnitTest extends AbstractKeycloakTest { public static final String CLIENT_NAME = "application"; - @BeforeClass - public static void enabled() { - ProfileAssume.assumeFeatureEnabled(Profile.Feature.AUTHORIZATION); - } - @Override public void addTestRealms(List testRealms) { RealmRepresentation testRealmRep = new RealmRepresentation(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ManagementPermissionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ManagementPermissionsTest.java index bc3c690516f2..b5e3d1a0adfc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ManagementPermissionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ManagementPermissionsTest.java @@ -16,7 +16,6 @@ */ package org.keycloak.testsuite.admin; -import org.junit.BeforeClass; import org.junit.Test; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.GroupResource; @@ -25,7 +24,7 @@ import org.keycloak.common.Profile; import org.keycloak.representations.idm.*; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.ProfileAssume; +import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import javax.ws.rs.core.Response; @@ -36,13 +35,9 @@ /** * @author Leon Graser */ +@EnableFeature(value = Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, skipRestart = true) public class ManagementPermissionsTest extends AbstractTestRealmKeycloakTest { - @BeforeClass - public static void enabled() { - ProfileAssume.assumeFeatureEnabled(Profile.Feature.AUTHORIZATION); - } - @Override public void configureTestRealm(RealmRepresentation testRealm) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UsersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UsersTest.java index 0c4ee9f21065..138c689ad4c5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UsersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UsersTest.java @@ -32,7 +32,7 @@ import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; import org.keycloak.representations.idm.authorization.UserPolicyRepresentation; -import org.keycloak.testsuite.ProfileAssume; +import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.util.AdminClientUtil; import java.io.IOException; @@ -224,17 +224,15 @@ public void countUsersByFiltersWithViewPermission() { } @Test + @EnableFeature(value = Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, skipRestart = true) public void countUsersWithGroupViewPermission() throws CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException, IOException { - ProfileAssume.assumeFeatureEnabled(Profile.Feature.AUTHORIZATION); - RealmResource testRealmResource = setupTestEnvironmentWithPermissions(true); assertThat(testRealmResource.users().count(), is(3)); } @Test + @EnableFeature(value = Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, skipRestart = true) public void countUsersBySearchWithGroupViewPermission() throws CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException, IOException { - ProfileAssume.assumeFeatureEnabled(Profile.Feature.AUTHORIZATION); - RealmResource testRealmResource = setupTestEnvironmentWithPermissions(true); //search all assertThat(testRealmResource.users().count("user"), is(3)); @@ -256,9 +254,8 @@ public void countUsersBySearchWithGroupViewPermission() throws CertificateExcept } @Test + @EnableFeature(value = Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, skipRestart = true) public void countUsersByFiltersWithGroupViewPermission() throws CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException, IOException { - ProfileAssume.assumeFeatureEnabled(Profile.Feature.AUTHORIZATION); - RealmResource testRealmResource = setupTestEnvironmentWithPermissions(true); //search username assertThat(testRealmResource.users().count(null, null, null, "user"), is(3)); @@ -293,17 +290,15 @@ public void countUsersByFiltersWithGroupViewPermission() throws CertificateExcep } @Test + @EnableFeature(value = Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, skipRestart = true) public void countUsersWithNoViewPermission() throws CertificateException, NoSuchAlgorithmException, KeyStoreException, IOException, KeyManagementException { - ProfileAssume.assumeFeatureEnabled(Profile.Feature.AUTHORIZATION); - RealmResource testRealmResource = setupTestEnvironmentWithPermissions(false); assertThat(testRealmResource.users().count(), is(0)); } @Test + @EnableFeature(value = Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, skipRestart = true) public void countUsersBySearchWithNoViewPermission() throws CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException, IOException { - ProfileAssume.assumeFeatureEnabled(Profile.Feature.AUTHORIZATION); - RealmResource testRealmResource = setupTestEnvironmentWithPermissions(false); //search all assertThat(testRealmResource.users().count("user"), is(0)); @@ -325,9 +320,8 @@ public void countUsersBySearchWithNoViewPermission() throws CertificateException } @Test + @EnableFeature(value = Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, skipRestart = true) public void countUsersByFiltersWithNoViewPermission() throws CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException, IOException { - ProfileAssume.assumeFeatureEnabled(Profile.Feature.AUTHORIZATION); - RealmResource testRealmResource = setupTestEnvironmentWithPermissions(false); //search username assertThat(testRealmResource.users().count(null, null, null, "user"), is(0)); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeSAML2Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeSAML2Test.java index 0408c45ab8e3..e245b08cbd27 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeSAML2Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeSAML2Test.java @@ -17,7 +17,6 @@ package org.keycloak.testsuite.oauth; -import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.keycloak.OAuth2Constants; @@ -54,7 +53,6 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; @@ -78,7 +76,6 @@ import java.util.Map; import static org.junit.Assert.assertNotNull; -import static org.keycloak.common.Profile.Feature.AUTHORIZATION; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_ID; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_USERNAME; import static org.keycloak.protocol.saml.SamlProtocol.SAML_ASSERTION_CONSUMER_URL_POST_ATTRIBUTE; @@ -89,6 +86,7 @@ */ @AuthServerContainerExclude(AuthServer.REMOTE) @EnableFeature(value = Profile.Feature.TOKEN_EXCHANGE, skipRestart = true) +@EnableFeature(value = Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, skipRestart = true) public class ClientTokenExchangeSAML2Test extends AbstractKeycloakTest { private static final String SAML_SIGNED_TARGET = "http://localhost:8080/saml-signed-assertion/"; @@ -104,11 +102,6 @@ public class ClientTokenExchangeSAML2Test extends AbstractKeycloakTest { @Rule public AssertEvents events = new AssertEvents(this); - @BeforeClass - public static void enabled() { - ProfileAssume.assumeFeatureEnabled(AUTHORIZATION); - } - @Override public void addTestRealms(List testRealms) { RealmRepresentation testRealmRep = new RealmRepresentation(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeTest.java index 37a4504f88ad..1b698605ad80 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeTest.java @@ -17,7 +17,6 @@ package org.keycloak.testsuite.oauth; -import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.keycloak.OAuth2Constants; @@ -49,7 +48,6 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; @@ -71,7 +69,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.keycloak.common.Profile.Feature.AUTHORIZATION; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_ID; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_USERNAME; import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; @@ -83,16 +80,12 @@ */ @AuthServerContainerExclude(AuthServer.REMOTE) @EnableFeature(value = Profile.Feature.TOKEN_EXCHANGE, skipRestart = true) +@EnableFeature(value = Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ, skipRestart = true) public class ClientTokenExchangeTest extends AbstractKeycloakTest { @Rule public AssertEvents events = new AssertEvents(this); - @BeforeClass - public static void enabled() { - ProfileAssume.assumeFeatureEnabled(AUTHORIZATION); - } - @Test @UncaughtServerErrorExpected @DisableFeature(value = Profile.Feature.TOKEN_EXCHANGE, skipRestart = true) From 11f5ec63c9f244634e51d829c3504bfacfe99ba8 Mon Sep 17 00:00:00 2001 From: Sebastian Schuster Date: Fri, 12 Aug 2022 09:42:29 +0200 Subject: [PATCH 2/2] 13647 Added null checks and some comments/questions for discussions. Will be squashed later if accepted. --- .../admin/permissions/ClientPermissions.java | 2 ++ .../admin/permissions/GroupPermissions.java | 7 ++++--- .../permissions/IdentityProviderPermissions.java | 2 ++ .../admin/permissions/MgmtPermissions.java | 16 +++++++++++----- .../admin/permissions/RolePermissions.java | 9 +++------ .../admin/permissions/UserPermissions.java | 7 ++++--- 6 files changed, 26 insertions(+), 17 deletions(-) diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissions.java index eb0ba994230c..ce39376ee1fd 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/permissions/ClientPermissions.java @@ -93,6 +93,7 @@ private String getExchangeToPermissionName(ClientModel client) { private void initialize(ClientModel client) { ResourceServer server = root.findOrCreateResourceServer(client); + if (server==null) return; Scope manageScope = manageScope(server); if (manageScope == null) { manageScope = authz.getStoreFactory().getScopeStore().create(server, AdminPermissionManagement.MANAGE_SCOPE); @@ -291,6 +292,7 @@ public Resource resource(ClientModel client) { @Override public Map getPermissions(ClientModel client) { + if (authz == null) return null; initialize(client); Map scopes = new LinkedHashMap<>(); scopes.put(AdminPermissionManagement.VIEW_SCOPE, viewPermission(client).getId()); diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissions.java index 382ec2c0b6a4..6e5f0699ff9c 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/permissions/GroupPermissions.java @@ -61,7 +61,7 @@ class GroupPermissions implements GroupPermissionEvaluator, GroupPermissionManag GroupPermissions(AuthorizationProvider authz, MgmtPermissions root) { this.authz = authz; this.root = root; - if (Profile.isFeatureEnabled(Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ)) { + if (authz!=null) { resourceStore = authz.getStoreFactory().getResourceStore(); policyStore = authz.getStoreFactory().getPolicyStore(); } else { @@ -96,9 +96,9 @@ private static String getViewMembersPermissionGroup(GroupModel group) { } private void initialize(GroupModel group) { - root.initializeRealmResourceServer(); + ResourceServer server = root.initializeRealmResourceServer(); + if (server == null) return; root.initializeRealmDefaultScopes(); - ResourceServer server = root.realmResourceServer(); Scope manageScope = root.realmManageScope(); Scope viewScope = root.realmViewScope(); Scope manageMembersScope = root.initializeRealmScope(MANAGE_MEMBERS_SCOPE); @@ -221,6 +221,7 @@ public Resource resource(GroupModel group) { @Override public Map getPermissions(GroupModel group) { + if (authz == null) return null; initialize(group); Map scopes = new LinkedHashMap<>(); scopes.put(AdminPermissionManagement.VIEW_SCOPE, viewPermission(group).getId()); diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/IdentityProviderPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/permissions/IdentityProviderPermissions.java index a4a90a33b0f6..4349b1404111 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/IdentityProviderPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/permissions/IdentityProviderPermissions.java @@ -70,6 +70,7 @@ private String getExchangeToPermissionName(IdentityProviderModel idp) { private void initialize(IdentityProviderModel idp) { ResourceServer server = root.initializeRealmResourceServer(); + if (server == null) return; Scope exchangeToScope = root.initializeScope(TOKEN_EXCHANGE, server); String resourceName = getResourceName(idp); @@ -139,6 +140,7 @@ public Resource resource(IdentityProviderModel idp) { @Override public Map getPermissions(IdentityProviderModel idp) { + if (authz==null) return null; initialize(idp); Map scopes = new LinkedHashMap<>(); scopes.put(TOKEN_EXCHANGE, exchangeToPermission(idp).getId()); diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/MgmtPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/permissions/MgmtPermissions.java index 772c4d4928d1..1f805103a645 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/MgmtPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/permissions/MgmtPermissions.java @@ -67,6 +67,7 @@ class MgmtPermissions implements AdminPermissionEvaluator, AdminPermissionManage protected RealmPermissions realmPermissions; protected ClientPermissions clientPermissions; protected IdentityProviderPermissions idpPermissions; + protected RolePermissions rolePermissions; MgmtPermissions(KeycloakSession session, RealmModel realm) { @@ -203,7 +204,9 @@ public RealmModel adminsRealm() { @Override public RolePermissions roles() { - return new RolePermissions(session, realm, authz, this); + if (rolePermissions!=null) return rolePermissions; + rolePermissions = new RolePermissions(session, realm, authz, this); + return rolePermissions; } @Override @@ -251,20 +254,20 @@ public ResourceServer resourceServer(ClientModel client) { @Override public ResourceServer realmResourceServer() { - if (!Profile.isFeatureEnabled(Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ)) return null; + if (authz == null) return null; if (realmResourceServer != null) return realmResourceServer; ClientModel client = getRealmManagementClient(); if (client == null) return null; - ResourceServerStore resourceServerStore = authz.getStoreFactory().getResourceServerStore(); - realmResourceServer = resourceServerStore.findByClient(client); + realmResourceServer = authz.getStoreFactory().getResourceServerStore().findByClient(client); return realmResourceServer; } public ResourceServer initializeRealmResourceServer() { - if (!Profile.isFeatureEnabled(Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ)) return null; + if (authz == null) return null; if (realmResourceServer != null) return realmResourceServer; ClientModel client = getRealmManagementClient(); + if (client == null) return null; realmResourceServer = authz.getStoreFactory().getResourceServerStore().findByClient(client); if (realmResourceServer == null) { realmResourceServer = authz.getStoreFactory().getResourceServerStore().create(client); @@ -277,12 +280,14 @@ public ResourceServer initializeRealmResourceServer() { public void initializeRealmDefaultScopes() { ResourceServer server = initializeRealmResourceServer(); + if (server == null) return; manageScope = initializeRealmScope(MgmtPermissions.MANAGE_SCOPE); viewScope = initializeRealmScope(MgmtPermissions.VIEW_SCOPE); } public Scope initializeRealmScope(String name) { ResourceServer server = initializeRealmResourceServer(); + if (server == null) return null; Scope scope = authz.getStoreFactory().getScopeStore().findByName(server, name); if (scope == null) { scope = authz.getStoreFactory().getScopeStore().create(server, name); @@ -291,6 +296,7 @@ public Scope initializeRealmScope(String name) { } public Scope initializeScope(String name, ResourceServer server) { + if (authz == null) return null; Scope scope = authz.getStoreFactory().getScopeStore().findByName(server, name); if (scope == null) { scope = authz.getStoreFactory().getScopeStore().create(server, name); diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissions.java index f045a38d26a9..7477aff8b1f9 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/permissions/RolePermissions.java @@ -90,6 +90,7 @@ private void disablePermissions(RoleModel role) { @Override public Map getPermissions(RoleModel role) { + if (authz == null) return null; initialize(role); Map scopes = new LinkedHashMap<>(); scopes.put(RolePermissionManagement.MAP_ROLE_SCOPE, mapRolePermission(role).getId()); @@ -123,9 +124,9 @@ public Policy mapClientScopePermission(RoleModel role) { @Override public Resource resource(RoleModel role) { - ResourceStore resourceStore = authz.getStoreFactory().getResourceStore(); ResourceServer server = resourceServer(role); if (server == null) return null; + ResourceStore resourceStore = authz.getStoreFactory().getResourceStore(); return resourceStore.findByName(server, getRoleResourceName(role)); } @@ -546,6 +547,7 @@ private void initialize(RoleModel role) { if (server == null) { ClientModel client = getRoleClient(role); server = root.findOrCreateResourceServer(client); + if (server == null ) return; } Scope mapRoleScope = mapRoleScope(server); if (mapRoleScope == null) { @@ -602,11 +604,6 @@ private String getMapCompositePermissionName(RoleModel role) { return MAP_ROLE_COMPOSITE_SCOPE + ".permission." + role.getId(); } - private ResourceServer sdfgetResourceServer(RoleModel role) { - ClientModel client = getRoleClient(role); - return root.findOrCreateResourceServer(client); - } - private static String getRoleResourceName(RoleModel role) { return "role.resource." + role.getId(); } diff --git a/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissions.java index 1154894390f1..2835b64a8b97 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/permissions/UserPermissions.java @@ -83,7 +83,7 @@ class UserPermissions implements UserPermissionEvaluator, UserPermissionManageme this.session = session; this.authz = authz; this.root = root; - if (Profile.isFeatureEnabled(Profile.Feature.ADMIN_FINE_GRAINED_AUTHZ)) { + if (authz != null) { policyStore = authz.getStoreFactory().getPolicyStore(); resourceStore = authz.getStoreFactory().getResourceStore(); } else { @@ -94,9 +94,9 @@ class UserPermissions implements UserPermissionEvaluator, UserPermissionManageme private void initialize() { - root.initializeRealmResourceServer(); + ResourceServer server = root.initializeRealmResourceServer(); + if (server == null) return; root.initializeRealmDefaultScopes(); - ResourceServer server = root.realmResourceServer(); Scope manageScope = root.realmManageScope(); Scope viewScope = root.realmViewScope(); Scope mapRolesScope = root.initializeRealmScope(MAP_ROLES_SCOPE); @@ -144,6 +144,7 @@ private void initialize() { @Override public Map getPermissions() { + if (authz == null) return null; initialize(); Map scopes = new LinkedHashMap<>(); scopes.put(AdminPermissionManagement.VIEW_SCOPE, viewPermission().getId());