Skip to content

[FR] Switch Default Behavior to not allow uppercase KQL Keywords #3574

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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 detection_rules/rule.py
Original file line number Diff line number Diff line change
Expand Up @@ -1405,7 +1405,7 @@ def get_unique_query_fields(rule: TOMLRule) -> List[str]:

cfg = set_eql_config(rule.contents.metadata.get('min_stack_version'))
with eql.parser.elasticsearch_syntax, eql.parser.ignore_missing_functions, eql.parser.skip_optimizations, cfg:
parsed = kql.parse(query, normalize_kql_keywords=True) if language == 'kuery' else eql.parse_query(query)
parsed = kql.parse(query) if language == 'kuery' else eql.parse_query(query)

return sorted(set(str(f) for f in parsed if isinstance(f, (eql.ast.Field, kql.ast.Field))))

Expand Down
6 changes: 3 additions & 3 deletions detection_rules/rule_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class KQLValidator(QueryValidator):

@cached_property
def ast(self) -> kql.ast.Expression:
return kql.parse(self.query, normalize_kql_keywords=True)
return kql.parse(self.query)

@cached_property
def unique_fields(self) -> List[str]:
Expand Down Expand Up @@ -80,7 +80,7 @@ def validate_stack_combos(self, data: QueryRuleData, meta: RuleMeta) -> Union[KQ
beats_version, ecs_version)

try:
kql.parse(self.query, schema=schema, normalize_kql_keywords=True)
kql.parse(self.query, schema=schema)
except kql.KqlParseError as exc:
message = exc.error_msg
trailer = err_trailer
Expand Down Expand Up @@ -135,7 +135,7 @@ def validate_integration(

# Validate the query against the schema
try:
kql.parse(self.query, schema=integration_schema, normalize_kql_keywords=True)
kql.parse(self.query, schema=integration_schema)
except kql.KqlParseError as exc:
if exc.error_msg == "Unknown field":
field = extract_error_field(self.query, exc)
Expand Down
2 changes: 1 addition & 1 deletion detection_rules/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ def convert_time_span(span: str) -> int:

def evaluate(rule, events):
"""Evaluate a query against events."""
evaluator = kql.get_evaluator(kql.parse(rule.query, normalize_kql_keywords=True))
evaluator = kql.get_evaluator(kql.parse(rule.query))
filtered = list(filter(evaluator, events))
return filtered

Expand Down
2 changes: 1 addition & 1 deletion tests/test_all_rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def test_all_rule_queries_optimized(self):
)
):
source = rule.contents.data.query
tree = kql.parse(source, optimize=False, normalize_kql_keywords=True)
tree = kql.parse(source, optimize=False)
optimized = tree.optimize(recursive=True)
err_message = f'\n{self.rule_str(rule)} Query not optimized for rule\n' \
f'Expected: {optimized}\nActual: {source}'
Expand Down