Skip to content

fix(api): strip leftover type/config when sensitive-word avoidance is disabled #38338

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

Open
SquabbyZ wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(api): strip leftover type/config when sensitive-word avoidance is disabled #38338

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
6 changes: 6 additions & 0 deletions api/core/app/app_config/common/sensitive_word_avoidance/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ def _normalize_raw(raw: Any) -> Any:
raw = {**raw, "enabled": False}
elif raw.get("enabled") is True and raw.get("config") is None:
raw = {**raw, "config": {}}
elif raw.get("enabled") is False:
# When the moderation is disabled, the client may still send
# leftover 'type' / 'config' fields (e.g. {"enabled": false, "type": "", "config": {}}).
# Strip them so the discriminator-tagged union in
# SensitiveWordAvoidanceDisabledConfig (extra="forbid") does not reject the payload.
raw = {key: value for key, value in raw.items() if key in {"enabled"}}
return raw


Expand Down
5 changes: 5 additions & 0 deletions api/tests/unit_tests/core/app/app_config/common/test_sensitive_word_avoidance_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ def test_validate_raises_when_not_dict(self):
{"sensitive_word_avoidance": {"enabled": False}},
{"sensitive_word_avoidance": {"enabled": None}},
{"sensitive_word_avoidance": {}},
# Regression for issue #38327: client sends leftover type/config fields
# alongside enabled=False. The normalize step must strip them so the
# discriminator-tagged union (extra="forbid") does not reject the payload.
{"sensitive_word_avoidance": {"enabled": False, "type": "", "config": {}}},
{"sensitive_word_avoidance": {"enabled": False, "type": "keywords", "config": {"k": "v"}}},
],
)
def test_validate_disables_when_enabled_false_or_missing(self, config):
Expand Down
Loading