Fix bug lucene lex (#742)

--------- Co-authored-by: Jörg Zimmermann <[email protected]>
fkie-cad · Jan 15, 2025 · f120c6c · f120c6c
1 parent 4bd0756
commit f120c6c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Features
 ### Improvements
 ### Bugfix
+* fixes a conflict between lucene filter and the Crypto module
 
 ## 15.1.0
 ### Breaking

diff --git a/logprep/filter/lucene_filter.py b/logprep/filter/lucene_filter.py
@@ -166,7 +166,7 @@ def create(query_string: str, special_fields: dict = None) -> FilterExpression:
         escaped_string = LuceneFilter._add_lucene_escaping(query_string)
 
         try:
-            tree = parser.parse(escaped_string)
+            tree = parser.parse(escaped_string, lexer=luqum.parser.lexer)
             transformer = LuceneTransformer(tree, special_fields)
         except ParseSyntaxError as error:
             msg = f"{error} Expression: '{escaped_string}'" + " - expression not escaped correctly."

diff --git a/tests/unit/filter/test_lucene_filter.py b/tests/unit/filter/test_lucene_filter.py
@@ -6,8 +6,8 @@
 from pytest import raises
 
 from logprep.filter.expression.filter_expression import (
-    And,
     Always,
+    And,
     Exists,
     Not,
     Null,
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,8 +6,8 @@ @@
     from pytest import raises
     from logprep.filter.expression.filter_expression import (
-        And,
         Always,
+        And,
         Exists,
         Not,
         Null,
@@ Expand Down @@