100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Keycloak provisioning updates fixes #499
Rich Turner5e69c105e297
diff --git a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.javaindex 25170ae4a..1c825af41 100644--- a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java+++ b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java@@ -242,7 +242,7 @@ public abstract class KeycloakIdentityProvider implements IdentityProvider {});}- final synchronized protected <T> T getRealms(Function<RealmsResource, T> consumer) {+ final synchronized public <T> T getRealms(Function<RealmsResource, T> consumer) {RealmsResource realmsResource;ResteasyWebTarget target = keycloakTarget; // Track this in case active credentials updatedif ((realmsResource = realmsResourcePool.poll()) == null) {diff --git a/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java b/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.javaindex e2a53283e..cd05afb96 100644--- a/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java@@ -19,6 +19,9 @@*/package org.openremote.manager.setup;+import org.keycloak.admin.client.resource.RealmResource;+import org.keycloak.admin.client.resource.RoleResource;+import org.keycloak.representations.idm.ClientRepresentation;import org.openremote.manager.security.ManagerIdentityService;import org.openremote.manager.security.ManagerKeycloakIdentityProvider;import org.openremote.model.Container;@@ -27,6 +30,7 @@ import org.openremote.model.security.Tenant;import org.openremote.model.security.User;import java.util.Arrays;+import java.util.Collections;import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID;@@ -92,4 +96,24 @@ public abstract class AbstractKeycloakSetup implements Setup {}return user;}++ /**+ * Default realm roles will assign manage-account role to account client so we have to remove this role from the composite default roles+ * This is a temporary thing and when/if we move to groups we should look at explicit default roles on realm creation+ */+ protected void removeManageAccount(String realm) {+ keycloakProvider.<Void>getRealms(+ realmsResource -> {+ RealmResource realmResource = realmsResource.realm(realm);+ ClientRepresentation clientRepresentation = keycloakProvider.getClient(realm, "account");+ RoleResource roleResource = realmResource.roles().get("default-roles-" + realm);+ roleResource.getClientRoleComposites(clientRepresentation.getId())+ .stream()+ .filter(role -> role.getName().equals("manage-account"))+ .findFirst()+ .ifPresent(manageAccountRole -> roleResource.deleteComposites(Collections.singletonList(manageAccountRole)));+ return null;+ }+ );+ }}