lib/filtereventhandler: Handle eval exceptions

Author: ccrisan

qtoggleserver/lib/filtereventhandler.py

@@ -6,6 +6,7 @@
 from qtoggleserver.core import expressions as core_expressions
 from qtoggleserver.core import ports as core_ports
 from qtoggleserver.core.expressions import exceptions as expression_exceptions
+from qtoggleserver.core.expressions.exceptions import ExpressionEvalException
 from qtoggleserver.core.typing import Attribute, Attributes, NullablePortValue
 from qtoggleserver.slaves import devices as slaves_devices
 from qtoggleserver.slaves import events as slaves_events
@@ -275,7 +276,11 @@ async def accepts_port_value(
             elif isinstance(self._filter_port_value, core_expressions.Expression):  # an expression
                 port_values = {p.get_id(): p.get_last_read_value() for p in core_ports.get_all() if p.is_enabled()}
                 eval_context = core_expressions.EvalContext(port_values=port_values, now_ms=int(time.time() * 1000))
-                if new_value != await self._filter_port_value.eval(context=eval_context):
+                try:
+                    if new_value != await self._filter_port_value.eval(context=eval_context):
+                        return False
+                except ExpressionEvalException as e:
+                    self.warning('Expression evaluation failed for "%s": %s', self._filter_port_value, e)
                     return False
             elif new_value != self._filter_port_value:
                 return False
@@ -339,7 +344,11 @@ async def accepts(
         if self._filter_expression:
             port_values = {p.get_id(): p.get_last_read_value() for p in core_ports.get_all() if p.is_enabled()}
             eval_context = core_expressions.EvalContext(port_values=port_values, now_ms=int(time.time() * 1000))
-            if not await self._filter_expression.eval(context=eval_context):
+            try:
+                if not await self._filter_expression.eval(context=eval_context):
+                    return False
+            except ExpressionEvalException as e:
+                self.warning('Expression evaluation failed for "%s": %s', self._filter_expression, e)
                 return False
 
         return True

tests/unit/qtoggleserver/lib/test_filtereventhandler.py

@@ -151,6 +151,18 @@ async def test_expression_mismatch_blocks(self, mocker):
         handler = self.make_dummy_handler({"port_value": "50"})
         assert await handler.accepts_port_value(self.make_dummy_event(), (None, 40)) is False
 
+    async def test_expression_eval_error_blocks(self, mocker):
+        """Should reject when port_value expression evaluation raises ExpressionEvalException."""
+
+        mocker.patch("qtoggleserver.core.ports.get_all", return_value=[])
+        handler = self.make_dummy_handler({"port_value": "50"})
+        mocker.patch.object(
+            handler._filter_port_value,
+            "eval",
+            new=mocker.AsyncMock(side_effect=expression_exceptions.ExpressionEvalException("eval error")),
+        )
+        assert await handler.accepts_port_value(self.make_dummy_event(), (None, 50)) is False
+
 
 class TestFilterEventHandlerAcceptsPort(FilterEventHandlerTestBase):
     async def test_no_filter_passes(self, mock_num_port1):
@@ -256,6 +268,20 @@ async def test_expression_blocks(self, mock_num_port1, mocker):
         event = core_events.ValueChange(None, 40, mock_num_port1)
         assert await handler.accepts(event, (None, 40), {}, {}, {}, {}, {}) is False
 
+    async def test_expression_eval_error_blocks(self, mock_num_port1, mocker):
+        """Should reject when filter expression evaluation raises ExpressionEvalException."""
+
+        mocker.patch("qtoggleserver.core.ports.get_all", return_value=[mock_num_port1])
+        handler = ConcreteFilterEventHandler(filter={"expression": "GT($nid1, 50)"})
+        handler._prepare_filter()
+        mocker.patch.object(
+            handler._filter_expression,
+            "eval",
+            new=mocker.AsyncMock(side_effect=expression_exceptions.ExpressionEvalException("eval error")),
+        )
+        event = core_events.ValueChange(None, 60, mock_num_port1)
+        assert await handler.accepts(event, (None, 60), {}, {}, {}, {}, {}) is False
+
     async def test_invalid_expression(self, mock_num_port1):
         """Should raise ExpressionParseError when the filter expression is syntactically invalid."""