Skip to content

Commit 7f34b12

Browse files
committed
fix regex processing
1 parent 8803175 commit 7f34b12

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

uncoder-core/app/translator/core/str_value_manager.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ class ReEndOfStrSymbol(BaseSpecSymbol):
4242
...
4343

4444

45+
class ReWordBoundarySymbol(BaseSpecSymbol):
46+
...
47+
48+
4549
class ReWordSymbol(BaseSpecSymbol):
4650
...
4751

@@ -130,6 +134,7 @@ def has_spec_symbols(self) -> bool:
130134
SingleSymbolWildCard: "?",
131135
UnboundLenWildCard: "*",
132136
ReAnySymbol: ".",
137+
ReWordBoundarySymbol: r"\b",
133138
ReWordSymbol: r"\w",
134139
ReDigitalSymbol: r"\d",
135140
ReWhiteSpaceSymbol: r"\s",

uncoder-core/app/translator/platforms/base/aql/str_value_manager.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
ReRightParenthesis,
4040
ReRightSquareBracket,
4141
ReWhiteSpaceSymbol,
42+
ReWordBoundarySymbol,
4243
ReWordSymbol,
4344
ReZeroOrMoreQuantifier,
4445
ReZeroOrOneQuantifier,
@@ -74,6 +75,7 @@ class AQLStrValueManager(StrValueManager):
7475
escape_manager = aql_escape_manager
7576
container_spec_symbols_map: ClassVar[dict[type[BaseSpecSymbol], str]] = AQL_CONTAINER_SPEC_SYMBOLS_MAP
7677
re_str_alpha_num_symbols_map: ClassVar[dict[str, type[BaseSpecSymbol]]] = {
78+
"b": ReWordBoundarySymbol,
7779
"w": ReWordSymbol,
7880
"d": ReDigitalSymbol,
7981
"s": ReWhiteSpaceSymbol,

uncoder-core/app/translator/platforms/palo_alto/renders/cortex_xsiam.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ def _wrap_str_value(value: str) -> str:
6969

7070
def equal_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
7171
if isinstance(value, list):
72-
values = ", ".join(
73-
f"{self._pre_process_value(field, str(v) if isinstance(v, int) else v, ValueType.value, True)}"
74-
for v in value
75-
)
72+
values = ", ".join(f"{self._pre_process_value(field, v, ValueType.value, True)}" for v in value)
7673
return f"{field} in ({values})"
7774

7875
return f"{field} = {self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True)}"

uncoder-core/app/translator/platforms/sigma/str_value_manager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
SingleSymbolWildCard,
4040
StrValue,
4141
StrValueManager,
42-
UnboundLenWildCard,
42+
UnboundLenWildCard, ReWordBoundarySymbol,
4343
)
4444
from app.translator.platforms.sigma.escape_manager import sigma_escape_manager
4545

@@ -65,7 +65,7 @@
6565
class SigmaStrValueManager(StrValueManager):
6666
escape_manager = sigma_escape_manager
6767
str_spec_symbols_map = {"?": SingleSymbolWildCard, "*": UnboundLenWildCard}
68-
re_str_alpha_num_symbols_map = {"w": ReWordSymbol, "d": ReDigitalSymbol, "s": ReWhiteSpaceSymbol}
68+
re_str_alpha_num_symbols_map = {"b": ReWordBoundarySymbol, "w": ReWordSymbol, "d": ReDigitalSymbol, "s": ReWhiteSpaceSymbol}
6969
re_str_spec_symbols_map = RE_STR_SPEC_SYMBOLS_MAP
7070

7171
def from_str_to_container(self, value: str) -> StrValue:

0 commit comments

Comments
 (0)