lexical filter: fix parsing multiple or pattern (fixes #1296)

sni · Jul 21, 2023 · 7713f92 · 7713f92
1 parent 4470bb0
commit 7713f92
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/Thruk/Utils/Status.pm b/lib/Thruk/Utils/Status.pm
@@ -2771,7 +2771,7 @@ sub _lexical_combine {
         push @{$prev2->{'-'.$combine}},  $prev1;
         push @{$filter}, $prev2;
     } else {
-        push @{$filter}, { '-'.$combine => [$prev2, $prev1]};
+        return([{ '-'.$combine => [@{$filter}, $prev2, $prev1] }]);
     }
     return($filter);
 }

diff --git a/t/108-thruk_utils_status.t b/t/108-thruk_utils_status.t
@@ -3,7 +3,7 @@ use strict;
 use Test::More;
 use utf8;
 
-plan tests => 47;
+plan tests => 49;
 
 BEGIN {
     use lib('t');
@@ -63,6 +63,9 @@ _test_filter('last_check <= "lastyear"', 'Filter: last_check <= '.Thruk::Utils::
 _test_filter('(host_groups ~~ "g1" AND host_groups ~~ "g2")  OR (host_name = "h1" and display_name ~~ ".*dn.*")',
              "Filter: host_groups ~~ g1\nFilter: host_groups ~~ g2\nAnd: 2\nFilter: host_name = h1\nFilter: display_name ~~ .*dn.*\nAnd: 2\nOr: 2",
              "(host_groups ~~ 'g1' and host_groups ~~ 'g2') or (host_name = 'h1' and display_name ~~ '.*dn.*')");
+_test_filter('(host_name = 1) or (host_name = 2) or (host_name = 3)',
+             "Filter: host_name = 1\nFilter: host_name = 2\nFilter: host_name = 3\nOr: 3",
+             "host_name = 1 or host_name = 2 or host_name = 3");
 
 sub _test_filter {
     my($filter, $expect, $exp_ftext) = @_;