Skip to content
Open
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
19 changes: 17 additions & 2 deletions sentry_sdk/integrations/django/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -807,9 +807,24 @@ def size_of_file(self, file: "Any") -> int:

def parsed_body(self) -> "Optional[Dict[str, Any]]":
try:
return self.request.data
data = self.request.data
except Exception:
return RequestExtractor.parsed_body(self)
data = RequestExtractor.parsed_body(self)

# Set by Django's `sensitive_post_parameters` decorator
sensitive_post_parameters = getattr(
self.request, "sensitive_post_parameters", None
)
if sensitive_post_parameters and isinstance(data, dict):
if sensitive_post_parameters == "__ALL__":
sensitive_post_parameters = data.keys()

data = {
k: SENSITIVE_DATA_SUBSTITUTE if k in sensitive_post_parameters else v
for k, v in data.items()
}

return data


def _set_user_info(request: "WSGIRequest", event: "Event") -> None:
Expand Down
18 changes: 18 additions & 0 deletions tests/integrations/django/myapp/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ def path(path, *args, **kwargs):
return url("^{}$".format(path), *args, **kwargs)


from django.views.decorators.debug import sensitive_post_parameters
from django_helpers import views as helper_views

from . import views
Expand Down Expand Up @@ -60,6 +61,16 @@ def path(path, *args, **kwargs):
name="sentryclass_csrf",
),
path("post-echo", views.post_echo, name="post_echo"),
path(
"sensitive-post-parameters",
sensitive_post_parameters("credit_card_number")(views.message),
name="sensitive_post_parameters",
),
path(
"sensitive-post-parameters-all",
sensitive_post_parameters()(views.message),
name="sensitive_post_parameters_all",
),
path("template-exc", views.template_exc, name="template_exc"),
path("template-test", views.template_test, name="template_test"),
path("template-test2", views.template_test2, name="template_test2"),
Expand Down Expand Up @@ -154,6 +165,13 @@ def path(path, *args, **kwargs):
name="rest_framework_read_body_and_exc",
)
)
urlpatterns.append(
path(
"rest-framework-sensitive-post-parameters",
sensitive_post_parameters("credit_card_number")(views.rest_framework_exc),
name="rest_framework_sensitive_post_parameters",
)
)
urlpatterns.append(
path(
"rest-authenticated-hello",
Expand Down
35 changes: 35 additions & 0 deletions tests/integrations/django/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -1389,6 +1389,41 @@ def raw_data(self):
assert "data" not in event["request"]


@pytest.mark.parametrize(
"route, expected_data",
[
(
"sensitive_post_parameters",
{"name": "Jane", "credit_card_number": "[Filtered]"},
),
(
"sensitive_post_parameters_all",
{"name": "[Filtered]", "credit_card_number": "[Filtered]"},
),
(
"rest_framework_sensitive_post_parameters",
{"name": "Jane", "credit_card_number": "[Filtered]"},
),
],
)
def test_sensitive_post_parameters(
sentry_init, client, capture_events, route, expected_data
):
if route == "rest_framework_sensitive_post_parameters":
pytest.importorskip("rest_framework")

sentry_init(integrations=[DjangoIntegration()])
events = capture_events()

client.post(
reverse(route),
data={"name": "Jane", "credit_card_number": "4111111111111111"},
)

(event,) = events
assert event["request"]["data"] == expected_data


@pytest.mark.parametrize("span_streaming", [True, False])
def test_template_tracing_meta(
sentry_init,
Expand Down