Skip to content

feat(pii): Scrub chunked cookies #6392

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

Merged
loewenheim merged 2 commits into from
Sep 16, 2026
Merged

feat(pii): Scrub chunked cookies #6392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99f2a15
feat(pii): Scrub chunked cookies
loewenheim Sep 16, 2026
3cfe904
Merge branch 'master' into sebastian/cookie-pii-chunked
loewenheim Sep 16, 2026
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
**Features**:

- Extend cookie scrubbing to response cookies. ([#6391](https://github.com/getsentry/relay/pull/6391))
- Scrub numbered variants of sensitive cookies. ([#6392](https://github.com/getsentry/relay/pull/6392))

**Internal**:

Expand Down
6 changes: 3 additions & 3 deletions relay-pii/src/convert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1698,7 +1698,7 @@ THd+9FBxiHLGXNKhG/FRSyREXEt+NyYIf/0cyByc9tNksat794ddUqnLOg0vwSkv
"contexts": {
"trace": {
"data": {
"http.request.header.cookie": "baz=quux; session=foobar; language=en; csrf=u32t4o3tb3gg43; foo=bar",
"http.request.header.cookie": "baz=quux; session__0=foobar; language=en; csrf=u32t4o3tb3gg43; foo=bar",
"http.request.header.cookie.sentrysid": "foobar",
"http.request.header.cookie.sudo": "foobar",
"http.request.header.cookie.su": "foobar",
Expand Down Expand Up @@ -1752,7 +1752,7 @@ THd+9FBxiHLGXNKhG/FRSyREXEt+NyYIf/0cyByc9tNksat794ddUqnLOg0vwSkv
},
"spans": [{
"data": {
"http.request.header.cookie": "baz=quux; session=foobar; language=en; csrf=u32t4o3tb3gg43; foo=bar",
"http.request.header.cookie": "baz=quux; session__0=foobar; language=en; csrf=u32t4o3tb3gg43; foo=bar",
"http.request.header.cookie.sentrysid": "foobar",
"http.request.header.cookie.sudo": "foobar",
"http.request.header.cookie.su": "foobar",
Expand Down Expand Up @@ -1817,7 +1817,7 @@ THd+9FBxiHLGXNKhG/FRSyREXEt+NyYIf/0cyByc9tNksat794ddUqnLOg0vwSkv
let mut data = SpanV2::from_value(
serde_json::json!({
"attributes": {
"http.request.header.cookie": {"value": ["baz=quux", "session=foobar", "language=en", "csrf=u32t4o3tb3gg43", "foo=bar"]},
"http.request.header.cookie": {"value": ["baz=quux", "session__0=foobar", "language=en", "csrf=u32t4o3tb3gg43", "foo=bar"]},
"http.request.header.cookie.sentrysid": {"value": "foobar"},
"http.request.header.cookie.sudo": {"value": "foobar"},
"http.request.header.cookie.su": {"value": "foobar"},
Expand Down
2 changes: 1 addition & 1 deletion relay-pii/src/regexes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ pub static SENSITIVE_COOKIE_NAMES: &[&str] = &[

static COOKIE_REGEX: LazyLock<Regex> = LazyLock::new(|| {
let variants = SENSITIVE_COOKIE_NAMES.join("|");
let r = format!("(?i)\\b(?:{variants})=([^;]+)");
let r = format!("(?i)\\b(?:(?:{variants})(?:__\\d+)?)=([^;]+)");
Regex::new(&r).unwrap()
});

Expand Down
24 changes: 12 additions & 12 deletions relay-pii/src/snapshots/relay_pii__convert__tests__span_cookie.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ expression: data
"contexts": {
"trace": {
"data": {
"http.request.header.cookie": "baz=quux; session=[Filtered]; language=en; csrf=[Filtered]; foo=bar",
"http.request.header.cookie": "baz=quux; session__0=[Filtered]; language=en; csrf=[Filtered]; foo=bar",
"http.request.header.cookie.__session": "[Filtered]",
"http.request.header.cookie._csrf": "[Filtered]",
"http.request.header.cookie._iris_csrf": "[Filtered]",
Expand Down Expand Up @@ -61,7 +61,7 @@ expression: data
"spans": [
{
"data": {
"http.request.header.cookie": "baz=quux; session=[Filtered]; language=en; csrf=[Filtered]; foo=bar",
"http.request.header.cookie": "baz=quux; session__0=[Filtered]; language=en; csrf=[Filtered]; foo=bar",
"http.request.header.cookie.__session": "[Filtered]",
"http.request.header.cookie._csrf": "[Filtered]",
"http.request.header.cookie._iris_csrf": "[Filtered]",
Expand Down Expand Up @@ -122,17 +122,17 @@ expression: data
[
"@cookies:filter",
"s",
18,
28
21,
31
],
[
"@cookies:filter",
"s",
48,
58
51,
61
]
],
"len": 67
"len": 70
}
},
"http.request.header.cookie.__session": {
Expand Down Expand Up @@ -738,17 +738,17 @@ expression: data
[
"@cookies:filter",
"s",
18,
28
21,
31
],
[
"@cookies:filter",
"s",
48,
58
51,
61
]
],
"len": 67
"len": 70
}
},
"http.request.header.cookie.__session": {
Expand Down
8 changes: 4 additions & 4 deletions relay-pii/src/snapshots/relay_pii__convert__tests__span_v2_cookie.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ expression: data
"http.request.header.cookie": {
"value": [
"baz=quux",
"session=[Filtered]",
"session__0=[Filtered]",
"language=en",
"csrf=[Filtered]",
"foo=bar"
Expand Down Expand Up @@ -171,11 +171,11 @@ expression: data
[
"@cookies:filter",
"s",
8,
18
11,
21
]
],
"len": 14
"len": 17
}
},
"3": {
Expand Down
Loading