Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Make sure we don't upload any user ids in tags either

Browse source
This commit is contained in:
Jorge Martín 2025-12-17 13:09:23 +01:00 • committed by Jorge Martin Espinosa
parent 515f7f4946
commit 165032ea02
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProvider.kt
View file

@ -118,11 +118,15 @@ class SentryAnalyticsProvider(
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
internal fun prepareTransactionBeforeSend(transaction: SentryTransaction): SentryTransaction { internal fun prepareTransactionBeforeSend(transaction: SentryTransaction): SentryTransaction {
// Ensure we'll never upload any session ids // Ensure we'll never upload any session ids in extras or tags
val possibleSessionIds = transaction.extras?.filter { (it.value as? String)?.startsWith("@") == true }.orEmpty() val invalidExtras = transaction.extras?.filter { (it.value as? String)?.startsWith("@") == true }.orEmpty()
for (invalidExtra in possibleSessionIds) { for (invalidExtra in invalidExtras) {
transaction.removeExtra(invalidExtra.key) transaction.removeExtra(invalidExtra.key)
} }
val invalidTags = transaction.tags?.filter { it.value.startsWith("@") }.orEmpty()
for (invalidTag in invalidExtras) {
transaction.removeTag(invalidTag.key)
}
val sessionId = appNavigationStateService.appNavigationState.value.navigationState.currentSessionId() val sessionId = appNavigationStateService.appNavigationState.value.navigationState.currentSessionId()
if (sessionId != null) { if (sessionId != null) {