Skip to content

remove special regex character usage in log_format_utils/generate_log_format_regex (* still works). #64

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
viktorbeck98 merged 4 commits into from
Mar 9, 2026
Merged

remove special regex character usage in log_format_utils/generate_log_format_regex (* still works). #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b7463c
remove special regex character usage in log_format_utils/generate_log…
ernstleierzopf Mar 1, 2026
a54c431
fix pipeline config to use correct log_format.
ernstleierzopf Mar 8, 2026
6170fec
Merge pull request #74 from ait-detectmate/development
ernstleierzopf Mar 8, 2026
14b3901
fix new value detector test.
ernstleierzopf Mar 8, 2026
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 config/pipeline_config_default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ parsers:
MatcherParser:
method_type: matcher_parser
auto_config: False
log_format: "type=<Type> msg=audit(<Time>): <Content>"
log_format: "type=<Type> msg=audit(<Time>:*): <Content>"
time_format: null
params:
remove_spaces: True
Expand Down
6 changes: 3 additions & 3 deletions src/detectmatelibrary/utils/log_format_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ def generate_logformat_regex(log_format: str) -> Tuple[list[str], re.Pattern[str
headers = []
splitters = re.split(r'(<[^<>]+>)', log_format)
regex_str = ''
for k in range(len(splitters)):
for k, part in enumerate(splitters):
if k % 2 == 0:
splitter = re.sub(r' +', r'\\s+', splitters[k])
regex_str += splitter
escaped = ''.join('\\' + c if c in '().[]{}?+|^$\\' else c for c in part)
regex_str += re.sub(r' +', r'\\s+', escaped)
else:
header = splitters[k].strip('<').strip('>')
regex_str += '(?P<%s>.*?)' % header
Expand Down
2 changes: 1 addition & 1 deletion tests/test_detectors/test_new_value_detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def test_detect_known_value_alert(self):
"MatcherParser": {
"method_type": "matcher_parser",
"auto_config": False,
"log_format": "type=<Type> msg=audit\\(<Time>\\): <Content>",
"log_format": "type=<Type> msg=audit(<Time>): <Content>",
"time_format": None,
"params": {
"remove_spaces": True,
Expand Down