Skip to content
Draft
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
4 changes: 3 additions & 1 deletion sentry_sdk/scrubber.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ def scrub_request(self, event: "Event") -> None:
if "cookies" in event["request"]:
self.scrub_dict(event["request"]["cookies"])
if "data" in event["request"]:
self.scrub_dict(event["request"]["data"])
data = event["request"]["data"]
self.scrub_dict(data) # no-op unless data is a dict
self.scrub_list(data) # no-op unless data is a list

def scrub_extra(self, event: "Event") -> None:
with capture_internal_exceptions():
Expand Down
53 changes: 53 additions & 0 deletions tests/test_scrubber.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,59 @@ def test_request_scrubbing(sentry_init, capture_events):
}


def test_request_scrubbing_list_body(sentry_init, capture_events):
sentry_init()
events = capture_events()

try:
1 / 0
except ZeroDivisionError:
ev, _hint = event_from_exception(sys.exc_info())

ev["request"] = {
"data": [
{"token": "secret", "foo": "bar"},
{"password": "secret", "baz": "qux"},
],
}

capture_event(ev)

(event,) = events

assert event["request"] == {
"data": [
{"token": "[Filtered]", "foo": "bar"},
{"password": "[Filtered]", "baz": "qux"},
],
}

assert event["_meta"]["request"] == {
"data": {
"0": {"token": {"": {"rem": [["!config", "s"]]}}},
"1": {"password": {"": {"rem": [["!config", "s"]]}}},
}
}


def test_recursive_request_scrubbing_list_body(sentry_init, capture_events):
sentry_init(event_scrubber=EventScrubber(recursive=True))
events = capture_events()

try:
1 / 0
except ZeroDivisionError:
ev, _hint = event_from_exception(sys.exc_info())

ev["request"] = {"data": [{"deep": {"password": "secret"}}]}

capture_event(ev)

(event,) = events

assert event["request"] == {"data": [{"deep": {"password": "[Filtered]"}}]}


def test_ip_address_not_scrubbed_when_pii_enabled(sentry_init, capture_events):
sentry_init(send_default_pii=True)
events = capture_events()
Expand Down