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
Authorization cleanup (check ClientRole against authenticated client) and client event cleanup
Rich Turner0a6d49a6d87b
diff --git a/agent/src/main/java/org/openremote/agent/protocol/ProtocolClientEventService.java b/agent/src/main/java/org/openremote/agent/protocol/ProtocolClientEventService.javaindex 1079e70ca..54657ef42 100644--- a/agent/src/main/java/org/openremote/agent/protocol/ProtocolClientEventService.java+++ b/agent/src/main/java/org/openremote/agent/protocol/ProtocolClientEventService.java@@ -20,6 +20,7 @@package org.openremote.agent.protocol;import org.apache.camel.Exchange;+import org.openremote.agent.protocol.event.ClientEventAgent;import org.openremote.model.ContainerService;import org.openremote.container.security.AuthContext;import org.openremote.container.web.ConnectionConstants;@@ -39,6 +40,7 @@ import static org.apache.camel.builder.Builder.header;*/public interface ProtocolClientEventService extends ContainerService {+ String CLIENT_ID_PREFIX = "ClientEvent-";String HEADER_ACCESS_RESTRICTED = ProtocolClientEventService.class.getName() + ".HEADER_ACCESS_RESTRICTED";String HEADER_CONNECTION_TYPE = ProtocolClientEventService.class.getName() + ".HEADER_CONNECTION_TYPE";String HEADER_CONNECTION_TYPE_WEBSOCKET = ProtocolClientEventService.class.getName() + ".HEADER_CONNECTION_TYPE_WEBSOCKET";@@ -135,4 +137,8 @@ public interface ProtocolClientEventService extends ContainerService {}return null;}++ static String getClientId(String suffix) {+ return CLIENT_ID_PREFIX + suffix;+ }}diff --git a/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventAgent.java b/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventAgent.javaindex 0496092a8..d04916f43 100644--- a/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventAgent.java+++ b/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventAgent.java@@ -22,6 +22,7 @@ package org.openremote.agent.protocol.event;import org.openremote.model.asset.agent.Agent;import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.asset.agent.AgentLink;+import org.openremote.model.attribute.MetaItem;import org.openremote.model.security.ClientRole;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.ValueDescriptor;@@ -30,12 +31,13 @@ import org.openremote.model.value.ValueType;import javax.persistence.Entity;import java.util.Optional;+import static org.openremote.model.value.MetaItemType.READ_ONLY;+@Entitypublic class ClientEventAgent extends Agent<ClientEventAgent, ClientEventProtocol, AgentLink.Default> {- public static final ValueDescriptor<ClientRole> VALUE_CLIENT_ROLE = new ValueDescriptor<>("clientRole", ClientRole.class);-- public static final AttributeDescriptor<String> CLIENT_SECRET = new AttributeDescriptor<>("clientSecret", ValueType.TEXT);+ public static final AttributeDescriptor<String> CLIENT_SECRET = new AttributeDescriptor<>("clientSecret", ValueType.UUID);+ public static final AttributeDescriptor<String> CLIENT_ID = new AttributeDescriptor<>("clientId", ValueType.TEXT, new MetaItem<>(READ_ONLY));public static final AttributeDescriptor<Boolean> WRITE = new AttributeDescriptor<>("write", ValueType.BOOLEAN);public static final AttributeDescriptor<Boolean> READ = new AttributeDescriptor<>("read", ValueType.BOOLEAN);@@ -68,6 +70,15 @@ public class ClientEventAgent extends Agent<ClientEventAgent, ClientEventProtocoreturn this;}+ public Optional<String> getClientId() {+ return getAttributes().getValue(CLIENT_ID);+ }++ public ClientEventAgent setClientId(String value) {+ getAttributes().getOrCreate(CLIENT_ID).setValue(value);+ return this;+ }+public Optional<Boolean> isRead() {return getAttributes().getValue(READ);}diff --git a/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventProtocol.javaindex 91ba62425..ea2e44510 100644--- a/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventProtocol.java@@ -53,21 +53,22 @@ import static org.openremote.model.syslog.SyslogCategory.PROTOCOL;public class ClientEventProtocol extends AbstractProtocol<ClientEventAgent, AgentLink.Default> {public static final String PROTOCOL_DISPLAY_NAME = "Client Event";- public static final String CLIENT_ID_PREFIX = "ClientEventProtocol-";protected static final Logger LOG = SyslogCategory.getLogger(PROTOCOL, ClientEventProtocol.class);public ClientEventProtocol(ClientEventAgent agent) {super(agent);}+ public static String getClientIdSuffix(ClientEventAgent agent) {+ return agent.getId().substring(12);+ }+@Overridepublic void doStart(Container container) throws Exception {LOG.info("Creating client credentials for: " + this);protocolClientEventService.addExchangeInterceptor(this::onMessageIntercept);-- String clientId = CLIENT_ID_PREFIX + agent.getId().substring(12);-+ String clientId = getClientId(getClientIdSuffix(agent));String clientSecret = agent.getClientSecret().orElse(UUID.randomUUID().toString());List<ClientRole> roles = new ArrayList<>();@@ -76,6 +77,7 @@ public class ClientEventProtocol extends AbstractProtocol<ClientEventAgent, Agen}if (agent.isWrite().orElse(false)) {roles.add(ClientRole.WRITE_ASSETS);+ roles.add(ClientRole.WRITE_ATTRIBUTES);}ProtocolClientEventService.ClientCredentials clientCredentials =@@ -88,6 +90,7 @@ public class ClientEventProtocol extends AbstractProtocol<ClientEventAgent, AgenprotocolClientEventService.addClientCredentials(clientCredentials);setConnectionStatus(ConnectionStatus.CONNECTED);+ updateAgentAttribute(new AttributeState(agent.getId(), ClientEventAgent.CLIENT_ID.getName(), clientId));updateAgentAttribute(new AttributeState(agent.getId(), ClientEventAgent.CLIENT_SECRET.getName(), clientSecret));}@@ -95,7 +98,7 @@ public class ClientEventProtocol extends AbstractProtocol<ClientEventAgent, Agenprotected void doStop(Container container) throws Exception {LOG.info("Removing client credentials for: " + this);protocolClientEventService.removeExchangeInterceptor(this::onMessageIntercept);- protocolClientEventService.removeClientCredentials(agent.getRealm(), CLIENT_ID_PREFIX + agent.getId());+ protocolClientEventService.removeClientCredentials(agent.getRealm(), getClientId(getClientIdSuffix(agent)));}@Override@@ -124,7 +127,7 @@ public class ClientEventProtocol extends AbstractProtocol<ClientEventAgent, Agen}protected void onMessageIntercept(Exchange exchange) {- String clientId = getClientId(exchange);+ String clientId = ProtocolClientEventService.getClientId(exchange);if (!isThisClient(clientId)) {return;@@ -161,6 +164,6 @@ public class ClientEventProtocol extends AbstractProtocol<ClientEventAgent, Agen}protected boolean isThisClient(String clientId) {- return Objects.equals(CLIENT_ID_PREFIX + agent.getId(), clientId);+ return Objects.equals(getClientId(getClientIdSuffix(agent)), clientId);}}diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.javaindex 75fda8df6..716b97057 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java@@ -144,14 +144,7 @@ public class AgentService extends RouteBuilder implements ContainerService, AsseCollection<Agent<?, ?, ?>> agents = getAgents().values();LOG.fine("Found agent count = " + agents.size());- agents.stream().filter(agent -> {- boolean isDisabled = agent.isDisabled().orElse(false);- if (isDisabled) {- LOG.fine("Agent is disabled so not starting: " + agent);- sendAttributeEvent(new AttributeEvent(agent.getId(), Agent.STATUS.getName(), ConnectionStatus.DISABLED));- }- return !isDisabled;- }).forEach(this::startAgent);+ agents.stream().forEach(this::doAgentInit);}@Override@@ -262,16 +255,8 @@ public class AgentService extends RouteBuilder implements ContainerService, Asseswitch (persistenceEvent.getCause()) {case CREATE:-agent = addReplaceAgent(agent);-- if (agent.isDisabled().orElse(false)) {- LOG.info("Agent is disabled so not starting: " + agent);- assetProcessingService.sendAttributeEvent(new AttributeEvent(agent.getId(), Agent.STATUS.getName(), ConnectionStatus.DISABLED));- } else {- startAgent(agent);- }-+ doAgentInit(agent);break;case UPDATE:onAgentUpdated(agent);@@ -300,13 +285,7 @@ public class AgentService extends RouteBuilder implements ContainerService, Assereturn null;}- if (agent.isDisabled().orElse(false)) {- LOG.info("Agent is disabled so not starting: " + agent);- assetProcessingService.sendAttributeEvent(new AttributeEvent(agent.getId(), Agent.STATUS.getName(), ConnectionStatus.DISABLED));- } else {- startAgent(agent);- }-+ doAgentInit(agent);return agent;}@@ -402,6 +381,16 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse}}+ protected void doAgentInit(Agent<?,?,?> agent) {+ boolean isDisabled = agent.isDisabled().orElse(false);+ if (isDisabled) {+ LOG.fine("Agent is disabled so not starting: " + agent);+ sendAttributeEvent(new AttributeEvent(agent.getId(), Agent.STATUS.getName(), ConnectionStatus.DISABLED));+ } else {+ this.startAgent(agent);+ }+ }+protected void startAgent(Agent<?,?,?> agent) {withLock(getClass().getSimpleName() + "::startAgent", () -> {try {@@ -737,7 +726,7 @@ public class AgentService extends RouteBuilder implements ContainerService, AsseProtocol<?> protocol = getProtocolInstance(agent.getId());if (protocol == null) {- throw new UnsupportedOperationException("Agent protocol is disabled or is being deleted");+ throw new UnsupportedOperationException("Agent is either invalid, disabled or mis-configured: " + agent);}if (!(protocol instanceof ProtocolAssetDiscovery)) {diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.javaindex 26b59db47..1874852b3 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java@@ -319,7 +319,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer// Regular user must have write attributes roleif (!authContext.hasResourceRoleOrIsSuperUser(ClientRole.WRITE_ATTRIBUTES.getValue(),- Constants.KEYCLOAK_CLIENT_ID)) {+ authContext.getClientId())) {throw new AssetProcessingException(INSUFFICIENT_ACCESS);}diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex ab79f7d97..577f41694 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -163,7 +163,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicreturn true;// Regular user must have role- if (!auth.hasResourceRole(ClientRole.READ_ASSETS.getValue(), Constants.KEYCLOAK_CLIENT_ID)) {+ if (!auth.hasResourceRole(ClientRole.READ_ASSETS.getValue(), auth.getClientId())) {return false;}@@ -381,7 +381,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicAuthContext authContext = exchange.getIn().getHeader(Constants.AUTH_CONTEXT, AuthContext.class);// Superuser can get all, User must have role- if (!authContext.isSuperUser() && !authContext.hasResourceRole(ClientRole.READ_ASSETS.getValue(), Constants.KEYCLOAK_CLIENT_ID)) {+ if (!authContext.isSuperUser() && !authContext.hasResourceRole(ClientRole.READ_ASSETS.getValue(), authContext.getClientId())) {return;}@@ -423,7 +423,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicAuthContext authContext = exchange.getIn().getHeader(Constants.AUTH_CONTEXT, AuthContext.class);// Superuser can get all, User must have role- if (!authContext.isSuperUser() && !authContext.hasResourceRole(ClientRole.READ_ASSETS.getValue(), Constants.KEYCLOAK_CLIENT_ID)) {+ if (!authContext.isSuperUser() && !authContext.hasResourceRole(ClientRole.READ_ASSETS.getValue(), authContext.getClientId())) {return;}diff --git a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.javaindex 1f1ccfbb0..dc6409558 100644--- a/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java+++ b/manager/src/main/java/org/openremote/manager/energy/EnergyOptimisationService.java@@ -512,7 +512,7 @@ public class EnergyOptimisationService extends RouteBuilder implements Container});}} else {- LOG.finer("Electricity asset doesn't have any predicted data for attribute: Ref=" + ref);+ LOG.finest("Electricity asset doesn't have any predicted data for attribute: Ref=" + ref);}values[0] = attribute.getValue().orElse(0d);diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.javaindex 5d6e4b27e..b664d3b8d 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java@@ -55,8 +55,6 @@ public class MqttBrokerService implements ContainerService {private static final Logger LOG = Logger.getLogger(MqttBrokerService.class.getName());public static final String MQTT_CLIENT_QUEUE = "seda://MqttClientQueue?waitForTaskToComplete=IfReplyExpected&timeout=10000&purgeWhenStopping=true&discardIfNoConsumers=false&size=25000";-- public static final String MQTT_CLIENT_ID_PREFIX = "mqtt-";public static final String MQTT_SERVER_LISTEN_HOST = "MQTT_SERVER_LISTEN_HOST";public static final String MQTT_SERVER_LISTEN_PORT = "MQTT_SERVER_LISTEN_PORT";diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.javaindex 827863df3..66756ef5e 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java@@ -163,7 +163,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse}// Regular user must have role- if (!auth.hasResourceRole(ClientRole.READ_ASSETS.getValue(), Constants.KEYCLOAK_CLIENT_ID)) {+ if (!auth.hasResourceRole(ClientRole.READ_ASSETS.getValue(), auth.getClientId())) {return false;}diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.javaindex d9af42187..fdce643dc 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java@@ -609,7 +609,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im// User must have roleif (requiredRoles != null) {for (ClientRole requiredRole : requiredRoles) {- if (!auth.hasResourceRole(requiredRole.getValue(), Constants.KEYCLOAK_CLIENT_ID)) {+ if (!auth.hasResourceRole(requiredRole.getValue(), auth.getClientId())) {return false;}}diff --git a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.javaindex 1c2db67e2..0588efbd5 100644--- a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java@@ -19,6 +19,7 @@*/package org.openremote.manager.security;+import org.openremote.container.security.AuthContext;import org.openremote.container.timer.TimerService;import org.openremote.manager.web.ManagerWebResource;import org.openremote.model.Constants;@@ -40,8 +41,9 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource@Overridepublic User[] getAll(RequestParams requestParams, String realm) {- boolean isAdmin = getAuthContext().hasResourceRole(ClientRole.READ_ADMIN.getValue(), Constants.KEYCLOAK_CLIENT_ID);- boolean isBasicRead = getAuthContext().hasResourceRole(ClientRole.READ_USERS.getValue(), Constants.KEYCLOAK_CLIENT_ID);+ AuthContext authContext = getAuthContext();+ boolean isAdmin = authContext.hasResourceRole(ClientRole.READ_ADMIN.getValue(), authContext.getClientId());+ boolean isBasicRead = authContext.hasResourceRole(ClientRole.READ_USERS.getValue(), authContext.getClientId());if (!isAdmin && !isBasicRead) {throw new ForbiddenException("Insufficient permissions to read users");diff --git a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.javaindex 0dcb3e428..117bc8f4d 100644--- a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java+++ b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java@@ -82,7 +82,7 @@ public class SyslogService extends Handler implements ContainerService {if (clientEventService != null) {clientEventService.addSubscriptionAuthorizer((auth, subscription) -> {// Only superuser can get logging events- return subscription.isEventType(SyslogEvent.class) && auth.hasResourceRole(Constants.READ_RULES_ROLE, Constants.KEYCLOAK_CLIENT_ID);+ return subscription.isEventType(SyslogEvent.class) && auth.hasResourceRole(Constants.READ_RULES_ROLE, auth.getClientId());});}diff --git a/model/src/main/java/org/openremote/model/Constants.java b/model/src/main/java/org/openremote/model/Constants.javaindex 55ebd6a94..c3c6d7e7d 100644--- a/model/src/main/java/org/openremote/model/Constants.java+++ b/model/src/main/java/org/openremote/model/Constants.java@@ -59,7 +59,7 @@ public interface Constants {String SETUP_EMAIL_FROM_DEFAULT = "[email protected]";String REQUEST_HEADER_REALM = "Auth-Realm";String ASSET_ID_REGEXP = "^[0-9A-Za-z]{22}$";- String UUID_REGEXP = "[0-9a-fA-F]{8}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{12}";+ String UUID_REGEXP = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}";String EMAIL_REGEXP = "(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])";String ISO8601_DURATION_REGEXP = "^P(?!$)((\\d+Y)|(\\d+\\.\\d+Y$))?((\\d+M)|(\\d+\\.\\d+M$))?((\\d+W)|(\\d+\\.\\d+W$))?((\\d+D)|(\\d+\\.\\d+D$))?(T(?=\\d)((\\d+H)|(\\d+\\.\\d+H$))?((\\d+M)|(\\d+\\.\\d+M$))?(\\d+(\\.\\d+)?S)?)??$";String ISO8601_DATETIME_REGEXP = "^(?:[1-9]\\d{3}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1\\d|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[1-9]\\d(?:0[48]|[2468][048]|[13579][26])|(?:[2468][048]|[13579][26])00)-02-29)T(?:[01]\\d|2[0-3]):[0-5]\\d:[0-5]\\d(?:Z|[+-][01]\\d:[0-5]\\d)$";diff --git a/test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.java b/test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.javaindex 59beef8a4..f929afc0d 100644--- a/test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.java+++ b/test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.java@@ -20,6 +20,8 @@package org.openremote.test.setup;import org.keycloak.representations.idm.ClientRepresentation;+import org.openremote.agent.protocol.ProtocolClientEventService;+import org.openremote.manager.event.ClientEventService;import org.openremote.model.Container;import org.openremote.container.util.UniqueIdentifierGenerator;import org.openremote.manager.mqtt.MqttBrokerService;@@ -31,9 +33,11 @@ import org.openremote.model.security.User;import java.util.Arrays;import java.util.List;+import java.util.UUID;import java.util.logging.Logger;import java.util.stream.Collectors;+import static org.openremote.agent.protocol.ProtocolClientEventService.getClientId;import static org.openremote.container.util.MapAccess.getString;import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID;import static org.openremote.model.Constants.MASTER_REALM;@@ -63,6 +67,8 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {public Tenant tenantBuilding;public Tenant energyTenant;public Tenant tenantCity;+ public static final String clientEventClientId = getClientId("test");+ public static final String clientEventClientSecret = UniqueIdentifierGenerator.generateId(getClientId("test"));public KeycloakTestSetup(Container container) {super(container);@@ -106,21 +112,17 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {keycloakProvider.updateUserRoles(tenantCity.getRealm(), smartCityUserId, "account"); // Remove all roles for account client/*- * MQTT Client+ * Client event keycloak client*/- ClientRepresentation mqttClient = new ClientRepresentation();- String buildingMqttClientId = MqttBrokerService.MQTT_CLIENT_ID_PREFIX + UniqueIdentifierGenerator.generateId(tenantBuilding.getRealm());- mqttClient.setClientId(buildingMqttClientId);- mqttClient.setName("MQTT");- mqttClient.setStandardFlowEnabled(false);- mqttClient.setImplicitFlowEnabled(false);- mqttClient.setDirectAccessGrantsEnabled(false);- mqttClient.setServiceAccountsEnabled(true);- mqttClient.setSecret(UniqueIdentifierGenerator.generateId(tenantBuilding.getRealm()));- mqttClient = keycloakProvider.createClient(tenantBuilding.getRealm(), mqttClient);+ ProtocolClientEventService.ClientCredentials clientCredentials =+ new ProtocolClientEventService.ClientCredentials(+ tenantBuilding.getRealm(),+ new ClientRole[] {ClientRole.READ_ASSETS, ClientRole.WRITE_ASSETS, ClientRole.WRITE_ATTRIBUTES},+ clientEventClientId,+ clientEventClientSecret+ );- // Add asset RW roles to service user- User serviceUser = keycloakProvider.getClientServiceUser(tenantBuilding.getRealm(), mqttClient.getClientId());- keycloakProvider.updateUserRoles(tenantBuilding.getRealm(), serviceUser.getId(), KEYCLOAK_CLIENT_ID, ClientRole.READ_ASSETS.getValue(), ClientRole.WRITE_ASSETS.getValue(), ClientRole.WRITE_ATTRIBUTES.getValue());+ ClientEventService clientEventService = container.getService(ClientEventService.class);+ clientEventService.addClientCredentials(clientCredentials);}}diff --git a/test/src/main/java/org/openremote/test/setup/TestSetupTasks.java b/test/src/main/java/org/openremote/test/setup/TestSetupTasks.javaindex 0bb92b310..d7c0f444b 100644--- a/test/src/main/java/org/openremote/test/setup/TestSetupTasks.java+++ b/test/src/main/java/org/openremote/test/setup/TestSetupTasks.java@@ -29,7 +29,7 @@ import java.util.List;import static org.openremote.container.util.MapAccess.getBoolean;/**- * Builtin setup tasks.+ * Test setup tasks.*/public class TestSetupTasks extends EmptySetupTasks {diff --git a/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy b/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovyindex 1cdcaa53c..0de1e5c7c 100644--- a/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy+++ b/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy@@ -9,6 +9,7 @@ import org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageServiceimport org.openremote.manager.mqtt.MqttBrokerServiceimport org.openremote.manager.setup.SetupService+import org.openremote.test.setup.KeycloakTestSetupimport org.openremote.test.setup.ManagerTestSetupimport org.openremote.model.attribute.AttributeEventimport org.openremote.model.attribute.AttributeRef@@ -48,12 +49,11 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {def container = startContainer(defaultConfig(), services)def managerTestSetup = container.getService(SetupService.class).getTaskOfType(ManagerTestSetup.class)def mqttBrokerService = container.getService(MqttBrokerService.class)- def assetProcessingService = container.getService(AssetProcessingService.class)def assetStorageService = container.getService(AssetStorageService.class)def agentService = container.getService(AgentService.class)def mqttClientId = managerTestSetup.realmBuildingTenant + MQTT_CLIENT_ID_SEPARATOR + UniqueIdentifierGenerator.generateId()- def clientId = MqttBrokerService.MQTT_CLIENT_ID_PREFIX + UniqueIdentifierGenerator.generateId(managerTestSetup.realmBuildingTenant)- def clientSecret = UniqueIdentifierGenerator.generateId(managerTestSetup.realmBuildingTenant)+ def clientId = KeycloakTestSetup.clientEventClientId+ def clientSecret = KeycloakTestSetup.clientEventClientSecretdef mqttHost = getString(container.getConfig(), MQTT_SERVER_LISTEN_HOST, BrokerConstants.HOST);def mqttPort = getInteger(container.getConfig(), MQTT_SERVER_LISTEN_PORT, BrokerConstants.PORT);