Skip to content

Logscale and qradar escaping fixes #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nazargesyk merged 1 commit into from
Jan 9, 2024
Merged

Logscale and qradar escaping fixes #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion translator/app/translator/platforms/logscale/escape_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class LogscaleEscapeManager(EscapeManager):
escape_map = {
ValueType.value: EscapeDetails(pattern='(\+|\\\\|{|\[|\*|"|\(|\)|/(?![*?\\\\]))')
ValueType.value: EscapeDetails(pattern='(/|\+|\\\\|{|\[|\*|"|\(|\)(?![*?\\\\]))')
}


Expand Down
2 changes: 1 addition & 1 deletion translator/app/translator/platforms/logscale/renders/logscale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def not_equal_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
def contains_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
if isinstance(value, list):
return f"({self.or_token.join(self.contains_modifier(field=field, value=v) for v in value)})"
return f'{self.apply_field_name(field_name=field)}=/{self.apply_value(value)}/i'
return f'{self.apply_field_name(field_name=field)}=/{self.apply_value(value) if value else "^"}/i'

def endswith_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
if isinstance(value, list):
Expand Down
6 changes: 1 addition & 5 deletions translator/app/translator/platforms/qradar/escape_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
from app.translator.core.custom_types.values import ValueType
from app.translator.core.escape_manager import EscapeManager
from app.translator.core.models.escape_details import EscapeDetails


class QradarEscapeManager(EscapeManager):
escape_map = {
ValueType.value: EscapeDetails(pattern="([\\\])")
}
escape_map = {}


qradar_escape_manager = QradarEscapeManager()
4 changes: 2 additions & 2 deletions translator/app/translator/platforms/qradar/renders/qradar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ class QradarFieldValue(BaseQueryFieldValue):

def apply_value(self, value: Union[str, int], value_type: str = ValueType.value) -> Union[str, int]:
if isinstance(value, str):
value = value.replace("\\'", "%").replace("'", '"')
value = value.replace("_", "__").replace("%", "%%").replace("\\'", "%").replace("'", '"')
if value.endswith("\\\\%"):
value = value.replace("\\\\%", "\\%")
return super().apply_value(value, value_type)
return value

def _apply_value(self, value: Union[str, int]) -> Union[str, int]:
if isinstance(value, str) and "\\" in value:
Expand Down