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
Robustness improvements for MQTT Handlers (#2119)
Rich Turnerb7248f360ace
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.javaindex fc72929a4..c5df54677 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.java@@ -288,6 +288,10 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,String topic = notification.getProperties().getSimpleStringProperty(ManagementHelper.HDR_ADDRESS).toString();ServerSession session = server.getActiveMQServer().getSessionByID(sessionId);+ if (session == null) {+ return;+ }+// Ignore internal subscriptionsboolean isInternal = session.getRemotingConnection().getTransportConnection() instanceof InVMConnection;if (isInternal) {diff --git a/manager/src/main/java/org/openremote/manager/mqtt/UserAssetProvisioningMQTTHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/UserAssetProvisioningMQTTHandler.javaindex 7ba7dc304..3208a105e 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/UserAssetProvisioningMQTTHandler.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/UserAssetProvisioningMQTTHandler.java@@ -212,7 +212,7 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {if (allowed) {// Only allow if there is no existing subscription for this topicRemotingConnection existingConnection = responseSubscribedConnections.get(topic.toString());- if (existingConnection != null) {+ if (existingConnection != null && existingConnection.getTransportConnection().isOpen()) {LOG.warning("Subscription already exists possible eavesdropping");allowed = false;}diff --git a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovyindex b58c7aba0..101557ebc 100644--- a/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy+++ b/test/src/test/groovy/org/openremote/test/provisioning/UserAndAssetProvisioningTest.groovy@@ -162,6 +162,10 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContasubscribeFailures.add(topic)LOG.info("device1Client failed to subscribe to topic: ${topic}")}+ Consumer<String> deviceNSubscribeFailureCallback = { String topic ->+ subscribeFailures.add(topic)+ LOG.info("deviceNClient failed to subscribe to topic: ${topic}")+ }device1Client = new MQTT_IOClient(mqttDevice1ClientId, mqttHost, mqttPort, false, false, null, null, null)device1SnoopClient = new MQTT_IOClient(mqttDevice1SnoopClientId, mqttHost, mqttPort, false, false, null, null, null)device1Client.setTopicSubscribeFailureConsumer(subscribeFailureCallback)@@ -471,7 +475,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContadef deviceNResponseTopic = "$PROVISIONING_TOKEN/$deviceNUniqueId/$RESPONSE_TOKEN".toString()def mqttDeviceNClientId = UniqueIdentifierGenerator.generateId("deviceN")deviceNClient = new MQTT_IOClient(mqttDeviceNClientId, mqttHost, mqttPort, false, false, null, null, null)- deviceNClient.setTopicSubscribeFailureConsumer(subscribeFailureCallback)+ deviceNClient.setTopicSubscribeFailureConsumer(deviceNSubscribeFailureCallback)deviceNClient.connect()then: "mqtt connection should exist"@@ -524,7 +528,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContadeviceNRequestTopic = "$PROVISIONING_TOKEN/$deviceNUniqueId/$REQUEST_TOKEN".toString()deviceNResponseTopic = "$PROVISIONING_TOKEN/$deviceNUniqueId/$RESPONSE_TOKEN".toString()deviceNClient = new MQTT_IOClient(mqttDeviceNClientId, mqttHost, mqttPort, false, false, null, null, null)- deviceNClient.setTopicSubscribeFailureConsumer(subscribeFailureCallback)+ deviceNClient.setTopicSubscribeFailureConsumer(deviceNSubscribeFailureCallback)deviceNClient.connect()then: "mqtt connection should exist"@@ -573,7 +577,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContadeviceNRequestTopic = "$PROVISIONING_TOKEN/$deviceNUniqueId/$REQUEST_TOKEN".toString()deviceNResponseTopic = "$PROVISIONING_TOKEN/$deviceNUniqueId/$RESPONSE_TOKEN".toString()deviceNClient = new MQTT_IOClient(mqttDeviceNClientId, mqttHost, mqttPort, false, false, null, null, null)- deviceNClient.setTopicSubscribeFailureConsumer(subscribeFailureCallback)+ deviceNClient.setTopicSubscribeFailureConsumer(deviceNSubscribeFailureCallback)deviceNClient.connect()then: "mqtt connection should exist"@@ -657,7 +661,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContawhen: "another device re-connects"deviceNResponses.clear()deviceNClient = new MQTT_IOClient(mqttDeviceNClientId, mqttHost, mqttPort, false, false, null, null, null)- deviceNClient.setTopicSubscribeFailureConsumer(subscribeFailureCallback)+ deviceNClient.setTopicSubscribeFailureConsumer(deviceNSubscribeFailureCallback)deviceNClient.connect()then: "mqtt connection should exist"@@ -757,7 +761,7 @@ class UserAndAssetProvisioningTest extends Specification implements ManagerContawhen: "a device with disabled user account connects"deviceNResponses.clear()deviceNClient = new MQTT_IOClient(mqttDeviceNClientId, mqttHost, mqttPort, false, false, null, null, null)- deviceNClient.setTopicSubscribeFailureConsumer(subscribeFailureCallback)+ deviceNClient.setTopicSubscribeFailureConsumer(deviceNSubscribeFailureCallback)deviceNClient.connect()then: "mqtt connection should exist"