Expo Router: wrap push, replace, navigate, back, dismiss in addition to prefetch#6221
Draft
alwx wants to merge 1 commit into
Draft
Expo Router: wrap push, replace, navigate, back, dismiss in addition to prefetch#6221alwx wants to merge 1 commit into
push, replace, navigate, back, dismiss in addition to prefetch#6221alwx wants to merge 1 commit into
Conversation
Contributor
Semver Impact of This PR⚪ None (no version bump detected) 📋 Changelog PreviewThis is how your changes will appear in the changelog.
🤖 This preview updates automatically when you update the PR. |
Contributor
Instructions and example for changelogPlease add an entry to Example: ## Unreleased
### Features
- wrap `push`, `replace`, `navigate`, `back`, `dismiss` in addition to `prefetch` ([#6221](https://github.com/getsentry/sentry-react-native/pull/6221))If none of the above apply, you can opt out of this check by adding |
![sentry-warden[bot]](https://avatars.githubusercontent.com/in/2755838?s=60&v=4){kind=small}
Comment on lines
+63
to
+80
| router.replace = wrapNavigationMethod(router, 'replace', router.replace.bind(router)); | ||
| } | ||
| if (router.navigate) { | ||
| router.navigate = wrapNavigationMethod(router, 'navigate', router.navigate.bind(router)); | ||
| } | ||
| if (router.back) { | ||
| router.back = wrapNavigationMethod(router, 'back', router.back.bind(router)) as NonNullable<T['back']>; | ||
| } | ||
| if (router.dismiss) { | ||
| const originalDismiss = router.dismiss.bind(router) as (...args: unknown[]) => unknown; | ||
| router.dismiss = wrapNavigationMethod(router, 'dismiss', originalDismiss) as NonNullable<T['dismiss']>; | ||
| } | ||
|
|
||
| wrappedRouter.__sentryWrapped = true; | ||
| return router; | ||
| } | ||
|
|
||
| function wrapPrefetch<T extends ExpoRouter>(router: T): void { |
There was a problem hiding this comment.
Navigation params added to breadcrumbs and spans without sendDefaultPii guard
Route params (which can contain user IDs and other PII) are unconditionally included in breadcrumb data and span attributes, but the existing reactnavigation.ts explicitly checks getClient()?.getOptions()?.sendDefaultPii before including any params — this new code bypasses that guard entirely.
Evidence
reactnavigation.ts:560–566checkssendDefaultPiibefore includingroute.urlor anyroute.params.*attributes in spans.reactnavigation.ts:578–584breadcrumb omits params entirely (from/toroute names only).wrapNavigationMethod(lines 63–80 of the new file) spreadsparsed.paramsdirectly into theaddBreadcrumbdata object and setsroute.href(which may encode params) as a span attribute with nosendDefaultPiicheck.- The PR checklist item "No new PII added" is unchecked.
Also found at 1 additional location
packages/core/src/js/tracing/expoRouter.ts:143-143
Identified by Warden code-review · 4TC-USJ
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
1 participant
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.
📢 Type of change
📜 Description
Fixes #6158
💡 Motivation and Context
💚 How did you test it?
📝 Checklist
sendDefaultPIIis enabled🔮 Next steps