fix(sentry): scrub percent-encoded Matrix IDs and opaque base64url tokens from URLs#531
Merged
7w1 merged 2 commits intoSableClient:devfrom Mar 25, 2026
Merged
Conversation
Member
|
hey it seems like you're missing a changeset. Can you please add a changeset, as described here https://github.com/SableClient/Sable/blob/dev/CONTRIBUTING.md#documenting-a-change Thank you :3 |
Contributor
Author
Yup, working on it. |
00c9655 to
6409005
Compare
dozro
reviewed
Mar 25, 2026
Co-authored-by: Rose <git@itsrye.dev>
7w1
approved these changes
Mar 25, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Extends
scrubMatrixUrlwith two additional patterns that were leaking through the existing scrubber.1. Opaque Matrix IDs with percent-encoded colon (
%3A)Device IDs, filter tokens, and other Matrix IDs that lack a sigil prefix but follow the
localpart%3Aserverpattern were not matched by the existing sigil-based patterns. For example:2. Long opaque base64url path segments
Access tokens, Curve25519 keys, MSC3575 session tokens, and push endpoints appear as 30+ character base64url strings in URL path segments. These were passing through unscrubbed. For example:
The new pattern runs last so the earlier sigil-based patterns already handle known Matrix IDs first.
Fixes #
Type of change
Checklist:
AI disclosure:
Two regex patterns added to
scrubMatrixUrlinsentryScrubbers.ts. The first matches path segments containing a barelocalpart%3Aserverform (no sigil) and replaces with[MATRIX_ID]. The second matches any path segment of 30 or more base64url characters and replaces with[REDACTED], covering access tokens, crypto keys, and opaque session identifiers. Both are appended after the existing patterns so known sigil-prefixed IDs are handled first.