filterx: add support for isset() on attributes

Signed-off-by: Balazs Scheidler <[email protected]>
axoflow · Jun 1, 2024 · 173eb69 · 173eb69
1 parent 587039a
commit 173eb69
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/lib/filterx/expr-getattr.c b/lib/filterx/expr-getattr.c
@@ -76,6 +76,21 @@ _unset(FilterXExpr *s)
   return result;
 }
 
+static gboolean
+_isset(FilterXExpr *s)
+{
+  FilterXGetAttr *self = (FilterXGetAttr *) s;
+  FilterXObject *variable = filterx_expr_eval_typed(self->operand);
+  if (!variable)
+    return FALSE;
+
+  gboolean result = filterx_object_is_key_set(variable, self->attr);
+
+  filterx_object_unref(variable);
+  return result;
+}
+
+
 static void
 _free(FilterXExpr *s)
 {
@@ -94,6 +109,7 @@ filterx_getattr_new(FilterXExpr *operand, const gchar *attr_name)
   filterx_expr_init_instance(&self->super);
   self->super.eval = _eval;
   self->super.unset = _unset;
+  self->super.is_set = _isset;
   self->super.free_fn = _free;
   self->operand = operand;
   self->attr = filterx_string_new(attr_name, -1);

diff --git a/tests/light/functional_tests/filterx/test_filterx.py b/tests/light/functional_tests/filterx/test_filterx.py
@@ -924,6 +924,7 @@ def test_isset(config, syslog_ng):
     isset(${values.int});
     not isset($almafa);
     isset($MSG["inner_key"]);
+    isset($MSG.inner_key);
     not isset($MSG["almafa"]);
 """,
     )