[mqtt.homeassistant] avoid improperly delivered triggers (openhab#17584)

if multiple DeviceTrigger components share a topic, and each has a payload value configured, only messages matching that payload should be delivered to the corresponding channel Signed-off-by: Cody Cutrer <cody@cutrer.us>
matchews · Oct 18, 2024 · a1d6440 · a1d6440
1 parent d56fdee
commit a1d6440
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/...hab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/ChannelState.java b/...hab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/ChannelState.java
@@ -173,6 +173,13 @@ public void processMessage(String topic, byte[] payload) {
 
         // Is trigger?: Special handling
         if (config.trigger) {
+            try {
+                cachedValue.parseMessage(new StringType(strValue));
+            } catch (IllegalArgumentException e) {
+                // invalid value for this trigger; ignore
+                receivedOrTimeout();
+                return;
+            }
             channelStateUpdateListener.triggerChannel(channelUID, strValue);
             receivedOrTimeout();
             return;

diff --git a/...ava/org/openhab/binding/mqtt/homeassistant/internal/component/AbstractComponentTests.java b/...ava/org/openhab/binding/mqtt/homeassistant/internal/component/AbstractComponentTests.java
@@ -237,6 +237,15 @@ protected void assertTriggered(AbstractComponent<@NonNull ? extends AbstractChan
         verify(thingHandler).triggerChannel(eq(component.getChannel(channelId).getChannel().getUID()), eq(trigger));
     }
 
+    /**
+     * Assert a channel does not triggers=
+     */
+    protected void assertNotTriggered(AbstractComponent<@NonNull ? extends AbstractChannelConfiguration> component,
+            String channelId, String trigger) {
+        verify(thingHandler, never()).triggerChannel(eq(component.getChannel(channelId).getChannel().getUID()),
+                eq(trigger));
+    }
+
     /**
      * Assert that given payload was published exact-once on given topic.
      *

diff --git a/...st/java/org/openhab/binding/mqtt/homeassistant/internal/component/DeviceTriggerTests.java b/...st/java/org/openhab/binding/mqtt/homeassistant/internal/component/DeviceTriggerTests.java
@@ -62,6 +62,9 @@ public void test() throws InterruptedException {
         spyOnChannelUpdates(component, "action");
         publishMessage("zigbee2mqtt/Charge Now Button/action", "on");
         assertTriggered(component, "action", "on");
+
+        publishMessage("zigbee2mqtt/Charge Now Button/action", "off");
+        assertNotTriggered(component, "action", "off");
     }
 
     @Override