Personal Certificate data in error Report available (EXPOSUREAPP-9923)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/BugReportingSharedModule.kt

@@ -10,6 +10,7 @@ import de.rki.coronawarnapp.bugreporting.censors.contactdiary.DiaryLocationCenso
 import de.rki.coronawarnapp.bugreporting.censors.contactdiary.DiaryPersonCensor
 import de.rki.coronawarnapp.bugreporting.censors.contactdiary.DiaryVisitCensor
 import de.rki.coronawarnapp.bugreporting.censors.contactdiary.OrganizerRegistrationTokenCensor
+import de.rki.coronawarnapp.bugreporting.censors.dcc.CwaUserCensor
 import de.rki.coronawarnapp.bugreporting.censors.dcc.DccQrCodeCensor
 import de.rki.coronawarnapp.bugreporting.censors.presencetracing.CheckInsCensor
 import de.rki.coronawarnapp.bugreporting.censors.presencetracing.TraceLocationCensor
@@ -36,6 +37,7 @@ import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.converter.protobuf.ProtoConverterFactory
 import javax.inject.Singleton
 
+@Suppress("TooManyFunctions")
 @Module
 class BugReportingSharedModule {
 
@@ -137,4 +139,8 @@ class BugReportingSharedModule {
     @Provides
     @IntoSet
     fun organizerRegistrationTokenCensor(censor: OrganizerRegistrationTokenCensor): BugCensor = censor
+
+    @Provides
+    @IntoSet
+    fun cwaUserCensor(censor: CwaUserCensor): BugCensor = censor
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/dcc/CwaUserCensor.kt

@@ -0,0 +1,50 @@
+package de.rki.coronawarnapp.bugreporting.censors.dcc
+
+import dagger.Reusable
+import de.rki.coronawarnapp.bugreporting.censors.BugCensor
+import de.rki.coronawarnapp.bugreporting.censors.BugCensor.CensorContainer
+import de.rki.coronawarnapp.covidcertificate.common.certificate.CertificatePersonIdentifier
+import de.rki.coronawarnapp.covidcertificate.person.core.PersonCertificatesSettings
+import javax.inject.Inject
+
+@Reusable
+class CwaUserCensor @Inject constructor(
+    private val personCertificatesSettings: PersonCertificatesSettings
+) : BugCensor {
+
+    override suspend fun checkLog(message: String): CensorContainer? {
+        var newMessage = CensorContainer(message)
+
+        personCertificatesSettings.currentCwaUser.value?.let { cwaUser ->
+            newMessage = censorCwaUserData(cwaUser, newMessage)
+        }
+
+        return newMessage.nullIfEmpty()
+    }
+
+    private fun censorCwaUserData(
+        cwaUser: CertificatePersonIdentifier,
+        message: CensorContainer
+    ): CensorContainer {
+        var newMessage = message
+
+        newMessage = newMessage.censor(
+            cwaUser.dateOfBirthFormatted,
+            "cwaUser/dateOfBirth"
+        )
+
+        newMessage = newMessage.censor(
+            cwaUser.lastNameStandardized,
+            "cwaUser/lastNameStandardized"
+        )
+
+        cwaUser.firstNameStandardized?.let { firstNameStandardized ->
+            newMessage = newMessage.censor(
+                firstNameStandardized,
+                "cwaUser/firstNameStandardized"
+            )
+        }
+
+        return newMessage
+    }
+}

Corona-Warn-App/src/test/java/de/rki/coronawarnapp/bugreporting/censors/CensorInjectionTest.kt

@@ -7,6 +7,7 @@ import de.rki.coronawarnapp.bugreporting.BugReportingSharedModule
 import de.rki.coronawarnapp.contactdiary.storage.repo.ContactDiaryRepository
 import de.rki.coronawarnapp.coronatest.CoronaTestRepository
 import de.rki.coronawarnapp.coronatest.antigen.profile.RATProfileSettings
+import de.rki.coronawarnapp.covidcertificate.person.core.PersonCertificatesSettings
 import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificateRepository
 import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
 import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository
@@ -19,6 +20,7 @@ import io.mockk.mockk
 import kotlinx.coroutines.flow.flowOf
 import org.junit.jupiter.api.Test
 import testhelpers.BaseTest
+import testhelpers.preferences.mockFlowPreference
 import timber.log.Timber
 import javax.inject.Singleton
 
@@ -108,4 +110,10 @@ class MockProvider {
     @Singleton
     @Provides
     fun ratProfileSettings(): RATProfileSettings = mockk()
+
+    @Singleton
+    @Provides
+    fun personCertificatesSettings(): PersonCertificatesSettings = mockk {
+        every { currentCwaUser } returns mockFlowPreference(null)
+    }
 }

Corona-Warn-App/src/test/java/de/rki/coronawarnapp/bugreporting/censors/dcc/CwaUserCensorTest.kt

@@ -0,0 +1,52 @@
+package de.rki.coronawarnapp.bugreporting.censors.dcc
+
+import de.rki.coronawarnapp.covidcertificate.common.certificate.CertificatePersonIdentifier
+import de.rki.coronawarnapp.covidcertificate.person.core.PersonCertificatesSettings
+import io.kotest.matchers.shouldBe
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import kotlinx.coroutines.test.runBlockingTest
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import testhelpers.BaseTest
+import testhelpers.preferences.mockFlowPreference
+
+@Suppress("MaxLineLength")
+class CwaUserCensorTest : BaseTest() {
+
+    @MockK lateinit var personCertificatesSettings: PersonCertificatesSettings
+
+    @BeforeEach
+    fun setup() {
+        MockKAnnotations.init(this)
+    }
+
+    private fun createInstance() = CwaUserCensor(personCertificatesSettings)
+
+    @Test
+    fun `censoring of certificate person identifier works`() = runBlockingTest {
+
+        every { personCertificatesSettings.currentCwaUser } returns mockFlowPreference(
+            CertificatePersonIdentifier(
+                "1982-02-11",
+                "LIME",
+                "MOTHER<MANDY"
+            )
+        )
+
+        val censor = createInstance()
+        val certDataToCensor = "PersonCertificatesProvider: vaccPersons=[], tests=[], recos=[], cwaUser=CertificatePersonIdentifier(dateOfBirthFormatted=1982-02-11, lastNameStandardized=LIME, firstNameStandardized=MOTHER<MANDY)"
+        censor.checkLog(certDataToCensor)!!
+            .compile()!!.censored shouldBe "PersonCertificatesProvider: vaccPersons=[], tests=[], recos=[], cwaUser=CertificatePersonIdentifier(dateOfBirthFormatted=cwaUser/dateOfBirth, lastNameStandardized=cwaUser/lastNameStandardized, firstNameStandardized=cwaUser/firstNameStandardized)"
+    }
+
+    @Test
+    fun `checkLog() should return null if nothing should be censored`() = runBlockingTest {
+        every { personCertificatesSettings.currentCwaUser } returns mockFlowPreference(null)
+
+        val censor = createInstance()
+        val certDataToCensor = "Nothing interesting here"
+        censor.checkLog(certDataToCensor) shouldBe null
+    }
+}

Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/CovidCertificateTestComponent.kt

@@ -7,6 +7,7 @@ import dagger.Provides
 import de.rki.coronawarnapp.appconfig.AppConfigProvider
 import de.rki.coronawarnapp.appconfig.ConfigData
 import de.rki.coronawarnapp.appconfig.PresenceTracingConfigContainer
+import de.rki.coronawarnapp.bugreporting.censors.dcc.CwaUserCensorTest
 import de.rki.coronawarnapp.bugreporting.censors.dcc.DccQrCodeCensorTest
 import de.rki.coronawarnapp.covidcertificate.booster.DccBoosterRulesValidatorTest
 import de.rki.coronawarnapp.covidcertificate.common.certificate.DccQrCodeExtractorTest
@@ -67,6 +68,7 @@ interface CovidCertificateTestComponent {
     fun inject(testClass: DccBoosterRulesValidatorTest)
     fun inject(testClass: QrCodeValidatorTest)
     fun inject(testClass: QrCodeScannerViewModelTest)
+    fun inject(testClass: CwaUserCensorTest)
 
     @Component.Factory
     interface Factory {