Skip to content
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

fix(asm): fix actions processing from RC [backport 2.9] #9405

Merged
merged 1 commit into from
May 28, 2024
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
1 change: 1 addition & 0 deletions ddtrace/appsec/_remoteconfiguration.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ def _appsec_rules_data(features: Mapping[str, Any], test_tracer: Optional[Tracer
_add_rules_to_list(features, "rules_override", "rules override", ruleset)
_add_rules_to_list(features, "scanners", "scanners", ruleset)
_add_rules_to_list(features, "processors", "processors", ruleset)
_add_rules_to_list(features, "actions", "actions", ruleset)
if ruleset:
return tracer._appsec_processor._update_rules({k: v for k, v in ruleset.items() if v is not None})

Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/actions_from_RC-08744fc9e91a8c02.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
fixes:
- |
ASM: This fix resolves an issue where an org could not customize actions through remote config.
15 changes: 14 additions & 1 deletion tests/appsec/appsec/test_remoteconfiguration.py
Original file line number Diff line number Diff line change
Expand Up @@ -985,9 +985,22 @@ def test_rc_rules_data(tracer):
config = {
"rules_data": [],
"custom_rules": [],
"actions": [],
"rules": json.load(dd_rules)["rules"],
"rules_override": [],
"scanners": [],
"processors": [],
"ignore": [],
}
assert _appsec_rules_data(config, tracer)
with mock.patch("ddtrace.appsec._processor.AppSecSpanProcessor._update_rules", autospec=True) as mock_update:
mock_update.reset_mock()
_appsec_rules_data(config, tracer)
calls = mock_update.mock_calls
for v in config:
if v == "ignore":
assert v not in calls[-1][1][1]
else:
assert v in calls[-1][1][1]


def test_rc_rules_data_error_empty(tracer):
Expand Down
Loading