Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Made it possible to send values trough mqtt without having a subscription

Michael Rademaker249c8bcb0935
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java
index 5bf905e5a..cf4c7a5ae 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java
@@ -213,21 +213,17 @@ public class EventInterceptHandler extends AbstractInterceptHandler {
attributeRef = new AttributeRef(assetId, topicParts[2]);
}
if (attributeRef == null) {
- if (connection.assetSubscriptions.containsKey(assetId)) {
- String payloadContent = msg.getPayload().toString(Charset.defaultCharset());
- Values.parse(payloadContent).flatMap(Values::getObject).ifPresent(objectValue -> {
- Map<String, Object> headers = prepareHeaders(connection);
- AttributeEvent attributeEvent = new AttributeEvent(assetId, objectValue.keys()[0], objectValue.get(objectValue.keys()[0]).orElse(null));
- messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, attributeEvent, headers);
- });
- }
- } else {
- if (connection.assetAttributeSubscriptions.containsKey(attributeRef) || connection.assetAttributeValueSubscriptions.containsKey(attributeRef)) {
- String payloadContent = msg.getPayload().toString(Charset.defaultCharset());
+ String payloadContent = msg.getPayload().toString(Charset.defaultCharset());
+ Values.parse(payloadContent).flatMap(Values::getObject).ifPresent(objectValue -> {
Map<String, Object> headers = prepareHeaders(connection);
- AttributeEvent attributeEvent = new AttributeEvent(assetId, attributeRef.getAttributeName(), Values.create(payloadContent));
+ AttributeEvent attributeEvent = new AttributeEvent(assetId, objectValue.keys()[0], objectValue.get(objectValue.keys()[0]).orElse(null));
messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, attributeEvent, headers);
- }
+ });
+ } else {
+ String payloadContent = msg.getPayload().toString(Charset.defaultCharset());
+ Map<String, Object> headers = prepareHeaders(connection);
+ AttributeEvent attributeEvent = new AttributeEvent(assetId, attributeRef.getAttributeName(), Values.create(payloadContent));
+ messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, attributeEvent, headers);
}
}
}
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java b/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java
index 7731d82ff..a243f4081 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java
@@ -10,8 +10,10 @@ import org.keycloak.representations.AccessToken;
import org.openremote.container.security.AuthContext;
import org.openremote.container.security.ClientCredentialsAuthForm;
import org.openremote.container.security.keycloak.AccessTokenAuthContext;
+import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.event.ClientEventService;
import org.openremote.manager.security.ManagerKeycloakIdentityProvider;
+import org.openremote.model.asset.Asset;
import org.openremote.model.asset.AssetFilter;
import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.event.shared.EventSubscription;
@@ -20,11 +22,9 @@ import org.openremote.model.security.ClientRole;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
-import java.util.Collections;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.util.stream.Collectors;
import static org.openremote.manager.mqtt.MqttBrokerService.*;
import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID;
@@ -34,13 +34,15 @@ public class KeycloakAuthorizatorPolicy implements IAuthorizatorPolicy {
private static final Logger LOG = Logger.getLogger(KeycloakAuthorizatorPolicy.class.getName());
protected final ManagerKeycloakIdentityProvider identityProvider;
+ protected final AssetStorageService assetStorageService;
protected final ClientEventService clientEventService;
protected final Map<String, MqttConnection> mqttConnectionMap;
public KeycloakAuthorizatorPolicy(ManagerKeycloakIdentityProvider identityProvider,
- ClientEventService clientEventService,
+ AssetStorageService assetStorageService, ClientEventService clientEventService,
Map<String, MqttConnection> mqttConnectionMap) {
this.identityProvider = identityProvider;
+ this.assetStorageService = assetStorageService;
this.clientEventService = clientEventService;
this.mqttConnectionMap = mqttConnectionMap;
}
@@ -103,6 +105,19 @@ public class KeycloakAuthorizatorPolicy implements IAuthorizatorPolicy {
AuthContext authContext = new AccessTokenAuthContext(connection.realm, accessToken);
if (Arrays.asList(roles).contains(ClientRole.WRITE_ASSETS)) { //write
+ Token token = topic.getTokens().get(1);
+ Asset asset = assetStorageService.find(token.toString());
+ if(asset == null) {
+ LOG.log(Level.INFO, "Asset not found");
+ return false;
+ }
+ if(topic.getTokens().size() > 2) {
+ token = topic.getTokens().get(2);
+ if (!asset.getAttribute(token.toString()).isPresent()) {
+ LOG.log(Level.INFO, "Attribute not found on asset");
+ return false;
+ }
+ }
return identityProvider.canSubscribeWith(authContext, new TenantFilter(connection.realm), roles);
} else { // read
String[] topicParts = topic.getTokens().stream().map(Token::toString).toArray(String[]::new);
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
index 9e751992c..3e446d93f 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
@@ -31,15 +31,14 @@ import org.apache.camel.builder.RouteBuilder;
import org.openremote.container.Container;
import org.openremote.container.ContainerService;
import org.openremote.container.message.MessageBrokerService;
+import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.event.ClientEventService;
import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.security.ManagerKeycloakIdentityProvider;
import org.openremote.manager.web.ManagerWebService;
import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.event.TriggeredEventSubscription;
-import org.openremote.model.value.ObjectValue;
import org.openremote.model.value.Value;
-import org.openremote.model.value.Values;
import java.nio.charset.Charset;
import java.util.*;
@@ -139,7 +138,9 @@ public class MqttBrokerService implements ContainerService {
properties.setProperty(BrokerConstants.PORT_PROPERTY_NAME, String.valueOf(port));
properties.setProperty(BrokerConstants.ALLOW_ANONYMOUS_PROPERTY_NAME, String.valueOf(false));
List<? extends InterceptHandler> interceptHandlers = Collections.singletonList(new EventInterceptHandler(identityProvider, messageBrokerService, mqttConnectionMap));
- mqttBroker.startServer(new MemoryConfig(properties), interceptHandlers, null, new KeycloakAuthenticator(identityProvider), new KeycloakAuthorizatorPolicy(identityProvider, clientEventService, mqttConnectionMap));
+
+ AssetStorageService assetStorageService = container.getService(AssetStorageService.class);
+ mqttBroker.startServer(new MemoryConfig(properties), interceptHandlers, null, new KeycloakAuthenticator(identityProvider), new KeycloakAuthorizatorPolicy(identityProvider, assetStorageService, clientEventService, mqttConnectionMap));
LOG.fine("Started MQTT broker");
}