From 49d0e193e299d38f1350e79b69871b82613bc329 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Fri, 20 Nov 2026 12:01:52 +0100 Subject: [PATCH] fix(nav3): Reject duplicate stringified argument keys --- CHANGELOG.md | 4 +++ .../internal/backstack/BackStackConverter.kt | 7 ++++++ .../backstack/ArgumentDuplicateKeysTest.kt | 25 +++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/ArgumentDuplicateKeysTest.kt diff --git a/CHANGELOG.md b/CHANGELOG.md index d7f627b40d..7049395c9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ ## Unreleased +### Behavioral Changes + +- Nav3: If a back stack entry's arguments contain a map with two keys that are recorded as the same string (e.g., `1` and `"1"`), Sentry now drops that entry's arguments and records `dropped_by_sentry: duplicate_key`, instead of keeping only one of the values ([#PR_NUMBER](https://github.com/getsentry/sentry-java/pull/PR_NUMBER)) + ### Dependencies - Nav3: `sentry-android-navigation3` no longer declares a dependency on `androidx.lifecycle:lifecycle-runtime-compose`. Nav3 apps already depend on it via `navigation3-ui`, so no app changes are necessary ([#PR_NUMBER](https://github.com/getsentry/sentry-java/pull/PR_NUMBER)) diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackConverter.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackConverter.kt index aef70e08bb..a549a39bb8 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackConverter.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackConverter.kt @@ -184,6 +184,12 @@ internal class BackStackConverter( for ((key, childValue) in value) { val keyString = key.toString() consumeCharacters(keyString.length) + if (sanitized.containsKey(keyString)) { + throw DropSubtree( + "Nav3 map keys stringify to the same string. Dropping this entry's arguments.", + ArgumentDropReason.DUPLICATE_KEY, + ) + } sanitized[keyString] = sanitizeValue(childValue, depth + 1) } return sanitized @@ -427,6 +433,7 @@ internal enum class ArgumentDropReason( ) { CHARACTER_LIMIT("max_character_limit_exceeded", exhaustsUpdateBudget = true), + DUPLICATE_KEY("duplicate_key"), INVALID_STRUCTURE("invalid_structure"), MAPPING_FAILED("mapping_failed"), MAX_COUNT("max_argument_count_exceeded", exhaustsUpdateBudget = true), diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/ArgumentDuplicateKeysTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/ArgumentDuplicateKeysTest.kt new file mode 100644 index 0000000000..1cab62669c --- /dev/null +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/ArgumentDuplicateKeysTest.kt @@ -0,0 +1,25 @@ +package io.sentry.compose.navigation3.internal.backstack + +import com.google.common.truth.Truth.assertThat +import io.sentry.NoOpLogger +import org.junit.Test + +class ArgumentDuplicateKeysTest { + @Test + fun `stringified key collisions drop only that entry`() { + val sanitizer = + BackStackConverter.ArgumentSanitizer( + NoOpLogger.getInstance(), + BackStackConverter.WarningState(), + ) + val result = + sanitizer.sanitizeEntry( + mapOf("nested" to linkedMapOf(1 to "first", "1" to "second")), + ) + assertThat(result.values).isEmpty() + assertThat(result.dropReason).isEqualTo(ArgumentDropReason.DUPLICATE_KEY) + val next = sanitizer.sanitizeEntry(mapOf("id" to 123)) + assertThat(next.dropReason).isNull() + assertThat(next.values).containsExactly("id", 123) + } +}