Skip to content

Commit 074b739

Browse files
committed
1 parent 2c8d277 commit 074b739

File tree

3 files changed

+94
-0
lines changed

3 files changed

+94
-0
lines changed

sentry_sdk/client.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from sentry_sdk.sessions import SessionFlusher
3030
from sentry_sdk.envelope import Envelope
3131
from sentry_sdk.profiler import setup_profiler
32+
from sentry_sdk.scrubber import EventScrubber
3233

3334
from sentry_sdk._types import TYPE_CHECKING
3435

@@ -111,6 +112,9 @@ def _get_options(*args, **kwargs):
111112
if rv["enable_tracing"] is True and rv["traces_sample_rate"] is None:
112113
rv["traces_sample_rate"] = 1.0
113114

115+
if rv["event_scrubber"] is None:
116+
rv["event_scrubber"] = EventScrubber()
117+
114118
return rv
115119

116120

@@ -250,6 +254,11 @@ def _prepare_event(
250254
self.options["project_root"],
251255
)
252256

257+
if event is not None:
258+
event_scrubber = self.options["event_scrubber"]
259+
if event_scrubber and not self.options["send_default_pii"]:
260+
event_scrubber.scrub_event(event)
261+
253262
# Postprocess the event here so that annotated types do
254263
# generally not surface in before_send
255264
if event is not None:

sentry_sdk/consts.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ def __init__(
128128
trace_propagation_targets=[ # noqa: B006
129129
MATCH_ALL
130130
], # type: Optional[Sequence[str]]
131+
event_scrubber=None, # type: Optional[sentry_sdk.scrubber.EventScrubber]
131132
):
132133
# type: (...) -> None
133134
pass

sentry_sdk/scrubber.py

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
from sentry_sdk.utils import (
2+
capture_internal_exceptions,
3+
AnnotatedValue,
4+
iter_event_frames,
5+
)
6+
from sentry_sdk._compat import string_types
7+
from sentry_sdk._types import TYPE_CHECKING
8+
9+
if TYPE_CHECKING:
10+
from sentry_sdk._types import Event
11+
from typing import Any
12+
from typing import Dict
13+
14+
15+
DEFAULT_DENYLIST = ["password", "custom-header", "custom_var"]
16+
17+
18+
class EventScrubber(object):
19+
def __init__(self, denylist=None):
20+
self.denylist = DEFAULT_DENYLIST if denylist is None else denylist
21+
22+
def scrub_dict(self, d):
23+
# type: (Dict[str, Any]) -> None
24+
if not isinstance(d, dict):
25+
return
26+
27+
for k in d.keys():
28+
if isinstance(k, string_types) and k.lower() in self.denylist:
29+
d[k] = AnnotatedValue.substituted_because_contains_sensitive_data()
30+
31+
def scrub_request(self, event):
32+
# type: (Event) -> None
33+
with capture_internal_exceptions():
34+
if "request" in event:
35+
if "headers" in event["request"]:
36+
self.scrub_dict(event["request"]["headers"])
37+
if "cookies" in event["request"]:
38+
self.scrub_dict(event["request"]["cookies"])
39+
if "data" in event["request"]:
40+
self.scrub_dict(event["request"]["data"])
41+
42+
def scrub_extra(self, event):
43+
# type: (Event) -> None
44+
with capture_internal_exceptions():
45+
if "extra" in event:
46+
self.scrub_dict(event["extra"])
47+
48+
def scrub_user(self, event):
49+
# type: (Event) -> None
50+
with capture_internal_exceptions():
51+
if "user" in event:
52+
self.scrub_dict(event["user"])
53+
54+
def scrub_breadcrumbs(self, event):
55+
# type: (Event) -> None
56+
with capture_internal_exceptions():
57+
if "breadcrumbs" in event:
58+
if "values" in event["breadcrumbs"]:
59+
for value in event["breadcrumbs"]["values"]:
60+
if "data" in value:
61+
self.scrub_dict(value["data"])
62+
63+
def scrub_frames(self, event):
64+
# type: (Event) -> None
65+
with capture_internal_exceptions():
66+
for frame in iter_event_frames(event):
67+
if "vars" in frame:
68+
self.scrub_dict(frame["vars"])
69+
70+
def scrub_spans(self, event):
71+
# type: (Event) -> None
72+
with capture_internal_exceptions():
73+
if "spans" in event:
74+
for span in event["spans"]:
75+
if "data" in span:
76+
self.scrub_dict(span["data"])
77+
78+
def scrub_event(self, event):
79+
self.scrub_request(event)
80+
self.scrub_extra(event)
81+
self.scrub_user(event)
82+
self.scrub_breadcrumbs(event)
83+
self.scrub_frames(event)
84+
self.scrub_spans(event)

0 commit comments

Comments
 (0)