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
Clearly distinguish between IdentityProvider updateUserRoles and updateUserRealmRoles
Rich Turnerce212fcc9953
diff --git a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.javaindex b59a27908..114aa5856 100644--- a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java+++ b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java@@ -41,6 +41,7 @@ import org.openremote.model.asset.Asset;import org.openremote.model.asset.UserAssetLink;import org.openremote.model.provisioning.*;import org.openremote.model.security.ClientRole;+import org.openremote.model.security.Role;import org.openremote.model.security.User;import org.openremote.model.syslog.SyslogCategory;import org.openremote.model.util.TextUtil;@@ -54,6 +55,7 @@ import java.security.cert.X509Certificate;import java.util.*;import java.util.logging.Level;import java.util.logging.Logger;+import java.util.stream.Collectors;import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;@@ -428,7 +430,7 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {if (provisioningConfig.isRestrictedUser()) {LOG.finer("User will be made restricted: realm=" + realm + ", username=" + username);- identityProvider.updateUserRoles(realm, serviceUser.getId(), null, RESTRICTED_USER_REALM_ROLE);+ identityProvider.updateUserRealmRoles(realm, serviceUser.getId(), identityProvider.addRealmRoles(realm, serviceUser.getId(),RESTRICTED_USER_REALM_ROLE));}// Inject secretdiff --git a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.javaindex 3b65e7bdb..4b07217f7 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java@@ -30,9 +30,8 @@ import org.openremote.model.security.*;import org.openremote.model.util.TextUtil;import javax.persistence.TypedQuery;-import java.util.ArrayList;-import java.util.List;-import java.util.Map;+import java.util.*;+import java.util.stream.Collectors;import java.util.stream.IntStream;import static org.openremote.manager.asset.AssetStorageService.buildMatchFilter;@@ -110,6 +109,12 @@ public interface ManagerIdentityProvider extends IdentityProvider {* BELOW ARE STATIC HELPER METHODS*/+ default String[] addRealmRoles(String realm, String userId, String...roles) {+ Set<String> realmRoles = Arrays.stream(getUserRealmRoles(realm, userId)).map(Role::getName).collect(Collectors.toCollection(LinkedHashSet::new));+ realmRoles.addAll(Arrays.asList(roles));+ return realmRoles.toArray(new String[0]);+ }+static User[] getUsersFromDb(PersistenceService persistenceService, UserQuery query) {StringBuilder sb = new StringBuilder();List<Object> parameters = new ArrayList<>();diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.javaindex c0b83e46d..7cf2a7543 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java@@ -45,6 +45,7 @@ import org.openremote.model.security.*;import org.openremote.model.util.TextUtil;import org.openremote.model.util.ValueUtil;+import javax.validation.constraints.NotNull;import javax.ws.rs.BadRequestException;import javax.ws.rs.NotAllowedException;import javax.ws.rs.NotFoundException;@@ -606,7 +607,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im}@Override- public void updateUserRoles(String realm, String userId, String client, String...roles) {+ public void updateUserRoles(@NotNull String realm, @NotNull String userId, @NotNull String client, String...roles) {getRealms(realmsResource -> {RealmResource realmResource = realmsResource.realm(realm);UserRepresentation user = realmResource.users().get(userId).toRepresentation();@@ -616,21 +617,17 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im}RoleMappingResource roleMappingResource = realmResource.users().get(user.getId()).roles();- ClientRepresentation clientRepresentation = null;- ClientResource clientResource = null;-- if (client != null) {- clientRepresentation = getClient(realm, client);+ ClientRepresentation clientRepresentation = getClient(realm, client);- if (clientRepresentation == null) {- throw new IllegalStateException("Invalid client: " + client);- }- clientResource = realmResource.clients().get(clientRepresentation.getId());+ if (clientRepresentation == null) {+ throw new IllegalStateException("Invalid client: " + client);}+ ClientResource clientResource = realmResource.clients().get(clientRepresentation.getId());+// Get all roles- List<RoleRepresentation> existingRoles = clientRepresentation != null ? roleMappingResource.clientLevel(clientRepresentation.getId()).listAll() : roleMappingResource.realmLevel().listAll();- List<RoleRepresentation> availableRoles = clientResource != null ? clientResource.roles().list() : realmResource.roles().list();+ List<RoleRepresentation> existingRoles = roleMappingResource.clientLevel(clientRepresentation.getId()).listAll();+ List<RoleRepresentation> availableRoles = clientResource.roles().list();List<RoleRepresentation> requestedRoles = availableRoles.stream().filter(role -> Arrays.stream(roles).anyMatch(name -> role.getName().equals(name))).collect(Collectors.toList());// Strip out requested roles that are already in a requested composite role@@ -657,18 +654,10 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im.collect(Collectors.toList());if (!removeRoles.isEmpty()) {- if (clientRepresentation != null) {- roleMappingResource.clientLevel(clientRepresentation.getId()).remove(removeRoles);- } else {- roleMappingResource.realmLevel().remove(removeRoles);- }+ roleMappingResource.clientLevel(clientRepresentation.getId()).remove(removeRoles);}if (!addRoles.isEmpty()) {- if (clientRepresentation != null) {- roleMappingResource.clientLevel(clientRepresentation.getId()).add(addRoles);- } else {- roleMappingResource.realmLevel().add(addRoles);- }+ roleMappingResource.clientLevel(clientRepresentation.getId()).add(addRoles);}return null;@@ -964,9 +953,9 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im}// TODO: Provide an implementation agnostic client- public ClientRepresentation getClient(String realm, String clientId) {+ public ClientRepresentation getClient(String realm, String client) {return getRealms(realmsResource ->- withClientResource(realm, clientId, realmsResource, (clientRepresentation, clientResource) ->+ withClientResource(realm, client, realmsResource, (clientRepresentation, clientResource) ->clientRepresentation, null));}diff --git a/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.java b/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.javaindex e41d3dd5b..3179e5875 100644--- a/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/KeycloakInitSetup.java@@ -20,13 +20,19 @@package org.openremote.manager.setup;import org.openremote.container.util.UniqueIdentifierGenerator;+import org.openremote.model.Constants;import org.openremote.model.Container;import org.openremote.model.auth.OAuthPasswordGrant;import org.openremote.model.security.ClientRole;+import org.openremote.model.security.Role;import org.openremote.model.security.Tenant;import org.openremote.model.security.User;+import java.util.Arrays;+import java.util.LinkedHashSet;+import java.util.Set;import java.util.logging.Logger;+import java.util.stream.Collectors;import static org.openremote.container.security.keycloak.KeycloakIdentityProvider.MANAGER_CLIENT_ID;import static org.openremote.model.Constants.*;@@ -72,7 +78,7 @@ public class KeycloakInitSetup extends AbstractKeycloakSetup {keycloakProxyUser = keycloakProvider.createUpdateUser(MASTER_REALM, keycloakProxyUser, password);// Make this proxy user a super user by giving them admin realm role- keycloakProvider.updateUserRoles(MASTER_REALM, keycloakProxyUser.getId(), null, "admin");+ keycloakProvider.updateUserRealmRoles(MASTER_REALM, keycloakProxyUser.getId(), keycloakProvider.addRealmRoles(MASTER_REALM, keycloakProxyUser.getId(), REALM_ADMIN_ROLE));// Update the grant to match the proxy user and make this grant activeOAuthPasswordGrant grant = keycloakProvider.getDefaultKeycloakGrant(container);diff --git a/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.java b/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.javaindex b57878610..11036ce4b 100644--- a/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.java+++ b/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.java@@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;import org.openremote.agent.protocol.simulator.SimulatorAgent;import org.openremote.agent.protocol.simulator.SimulatorAgentLink;import org.openremote.container.util.UniqueIdentifierGenerator;+import org.openremote.manager.security.ManagerIdentityProvider;import org.openremote.manager.setup.ManagerSetup;import org.openremote.model.Constants;import org.openremote.model.Container;@@ -33,9 +34,9 @@ import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.MetaItem;import org.openremote.model.geo.GeoJSONPoint;import org.openremote.model.security.Tenant;+import org.openremote.model.util.ValueUtil;import org.openremote.model.value.ValueConstraint;import org.openremote.model.value.ValueType;-import org.openremote.model.util.ValueUtil;import org.openremote.model.value.impl.ColourRGB;import java.util.Arrays;@@ -578,9 +579,9 @@ public class ManagerTestSetup extends ManagerSetup {apartment2BathroomId)));// ################################ Make users restricted ###################################-- identityService.getIdentityProvider().updateUserRoles(tenantBuilding.getRealm(), keycloakTestSetup.testuser3Id, null, RESTRICTED_USER_REALM_ROLE);- identityService.getIdentityProvider().updateUserRoles(tenantBuilding.getRealm(), keycloakTestSetup.buildingUserId, null, RESTRICTED_USER_REALM_ROLE);+ ManagerIdentityProvider identityProvider = identityService.getIdentityProvider();+ identityProvider.updateUserRealmRoles(tenantBuilding.getRealm(), keycloakTestSetup.testuser3Id, identityProvider.addRealmRoles(tenantBuilding.getRealm(), keycloakTestSetup.testuser3Id, RESTRICTED_USER_REALM_ROLE));+ identityProvider.updateUserRealmRoles(tenantBuilding.getRealm(), keycloakTestSetup.buildingUserId, identityProvider.addRealmRoles(tenantBuilding.getRealm(), keycloakTestSetup.buildingUserId, RESTRICTED_USER_REALM_ROLE));// ################################ Realm smartcity ###################################