Skip to content

splunk fixes #5

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
UncoderIO merged 1 commit into from
Nov 10, 2023
Merged

splunk fixes #5

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
4 changes: 2 additions & 2 deletions siem-converter/app/converter/backends/splunk/parsers/splunk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ def _parse_log_sources(self, query: str) -> Tuple[Dict[str, List[str]], str]:
log_sources.setdefault(source_type, [])
pattern = self.log_source_pattern.replace('___source_type___', source_type)
while search := re.search(pattern, query, flags=re.IGNORECASE):
results = search.groupdict()
value = results.get("value")
group_dict = search.groupdict()
value = group_dict.get("d_q_value") or group_dict.get("value")
log_sources.setdefault(source_type, []).append(value)
pos_start = search.start()
pos_end = search.end()
Expand Down
8 changes: 6 additions & 2 deletions siem-converter/app/converter/backends/splunk/tokenizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ class SplunkTokenizer(QueryTokenizer):
num_value_pattern = r"(?P<num_value>\d+(?:\.\d+)*)\s*"
double_quotes_value_pattern = r'"(?P<d_q_value>(?:[:a-zA-Z\*0-9=+%#\-_/,\'\.$&^@!\(\)\{\}\s]|\\\"|\\)*)"\s*'
single_quotes_value_pattern = r"'(?P<s_q_value>(?:[:a-zA-Z\*0-9=+%#\-_/,\"\.$&^@!\(\)\{\}\s]|\\\'|\\)*)'\s*"
_value_pattern = fr"{num_value_pattern}|{double_quotes_value_pattern}|{single_quotes_value_pattern}"
multi_value_pattern = r"""\((?P<value>[:a-zA-Z\"\*0-9=+%#\-_\/\\'\,.&^@!\(\s]*)\)"""
no_quotes_value = r"(?P<no_q_value>(?:[:a-zA-Z\*0-9=+%#\-_/,\.\\$&^@!])+)\s*"
_value_pattern = fr"{num_value_pattern}|{no_quotes_value}|{double_quotes_value_pattern}|{single_quotes_value_pattern}"
multi_value_pattern = r"""\((?P<value>[:a-zA-Z\"\*0-9=+%#\-_\/\\'\,.&^@!\(\s]+)\)"""
keyword_pattern = double_quotes_value_pattern

multi_value_operators = ("in",)
Expand All @@ -40,6 +41,9 @@ def get_operator_and_value(self, match: re.Match, operator: str = OperatorType.E
if num_value := get_match_group(match, group_name='num_value'):
return operator, num_value

elif no_q_value := get_match_group(match, group_name='no_q_value'):
return operator, no_q_value

elif d_q_value := get_match_group(match, group_name='d_q_value'):
return operator, d_q_value

Expand Down