Error report censoring (EXPOSUREAPP-14698) (#5833)

* update RapidQrCodeCensor * update RapidQrCodeCensor --------- Co-authored-by: Mohamed <[email protected]>
corona-warn-app · Feb 8, 2023 · 5cbec7f · 5cbec7f
1 parent f7fe0bc
commit 5cbec7f
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 32 deletions.
diff --git a/...p/src/main/java/de/rki/coronawarnapp/bugreporting/censors/submission/RapidQrCodeCensor.kt b/...p/src/main/java/de/rki/coronawarnapp/bugreporting/censors/submission/RapidQrCodeCensor.kt
@@ -16,26 +16,30 @@ class RapidQrCodeCensor @Inject constructor() : BugCensor {
 
     override suspend fun checkLog(message: String): CensorContainer? {
 
-        val dataToCensor = dataToCensor ?: return null
+        if (dataToCensor.isEmpty()) return null
 
         var newMessage = CensorContainer(message)
 
-        with(dataToCensor) {
-            newMessage = newMessage.censor(rawString, createReplacement(input = "ScannedRawString"))
+        dataToCensor.forEach { data ->
+            with(data) {
+                newMessage = newMessage.censor(rawString, createReplacement(input = "ScannedRawString"))
 
-            newMessage = newMessage.censor(hash, PLACEHOLDER + hash.takeLast(4))
+                newMessage = newMessage.censor(hash, PLACEHOLDER + hash.takeLast(4))
 
-            withValidName(firstName) { firstName ->
-                newMessage = newMessage.censor(firstName, createReplacement(input = "FirstName"))
-            }
+                withValidName(firstName) { firstName ->
+                    newMessage = newMessage.censor(firstName, createReplacement(input = "FirstName"))
+                    newMessage = newMessage.censor(firstName.uppercase(), createReplacement(input = "FirstName"))
+                }
 
-            withValidName(lastName) { lastName ->
-                newMessage = newMessage.censor(lastName, createReplacement(input = "LastName"))
-            }
+                withValidName(lastName) { lastName ->
+                    newMessage = newMessage.censor(lastName, createReplacement(input = "LastName"))
+                    newMessage = newMessage.censor(lastName.uppercase(), createReplacement(input = "FirstName"))
+                }
 
-            val dateOfBirthString = dateOfBirth?.format(dayOfBirthFormatter) ?: return@with
+                val dateOfBirthString = dateOfBirth?.format(dayOfBirthFormatter) ?: return@with
 
-            newMessage = newMessage.censor(dateOfBirthString, createReplacement(input = "DateOfBirth"))
+                newMessage = newMessage.censor(dateOfBirthString, createReplacement(input = "DateOfBirth"))
+            }
         }
 
         return newMessage.nullIfEmpty()
@@ -44,7 +48,7 @@ class RapidQrCodeCensor @Inject constructor() : BugCensor {
     private fun createReplacement(input: String): String = "$PLACEHOLDER_TYPE/$input"
 
     companion object {
-        var dataToCensor: CensorData? = null
+        val dataToCensor = mutableSetOf<CensorData>()
 
         private const val PLACEHOLDER = "SHA256HASH-ENDING-WITH-"
         private const val PLACEHOLDER_TYPE = "RapidTest"

diff --git a/...rn-App/src/main/java/de/rki/coronawarnapp/coronatest/qrcode/rapid/RapidQrCodeExtractor.kt b/...rn-App/src/main/java/de/rki/coronawarnapp/coronatest/qrcode/rapid/RapidQrCodeExtractor.kt
@@ -25,12 +25,14 @@ abstract class RapidQrCodeExtractor : QrCodeExtractor<CoronaTestQRCode> {
         Timber.tag(loggingTag).v("extract(rawString=%s)", rawString)
         val payload = CleanPayload(extractData(rawString))
 
-        RapidQrCodeCensor.dataToCensor = RapidQrCodeCensor.CensorData(
-            rawString = rawString,
-            hash = payload.hash,
-            firstName = payload.firstName,
-            lastName = payload.lastName,
-            dateOfBirth = payload.dateOfBirth
+        RapidQrCodeCensor.dataToCensor.add(
+            RapidQrCodeCensor.CensorData(
+                rawString = rawString,
+                hash = payload.hash,
+                firstName = payload.firstName,
+                lastName = payload.lastName,
+                dateOfBirth = payload.dateOfBirth
+            )
         )
 
         payload.requireValidData()

diff --git a/...Warn-App/src/test/java/de/rki/coronawarnapp/bugreporting/censors/RapidQrCodeCensorTest.kt b/...Warn-App/src/test/java/de/rki/coronawarnapp/bugreporting/censors/RapidQrCodeCensorTest.kt
@@ -22,19 +22,21 @@ internal class RapidQrCodeCensorTest {
 
     @AfterEach
     fun teardown() {
-        RapidQrCodeCensor.dataToCensor = null
+        RapidQrCodeCensor.dataToCensor.clear()
     }
 
     private fun createInstance() = RapidQrCodeCensor()
 
     @Test
     fun `checkLog() should return censored LogLine`() = runTest {
-        RapidQrCodeCensor.dataToCensor = RapidQrCodeCensor.CensorData(
-            rawString = testRawString,
-            hash = testHash,
-            firstName = "Milhouse",
-            lastName = "Van Houten",
-            dateOfBirth = LocalDate.parse("1980-07-01")
+        RapidQrCodeCensor.dataToCensor.add(
+            RapidQrCodeCensor.CensorData(
+                rawString = testRawString,
+                hash = testHash,
+                firstName = "Milhouse",
+                lastName = "Van Houten",
+                dateOfBirth = LocalDate.parse("1980-07-01")
+            )
         )
 
         val censor = createInstance()
@@ -57,12 +59,14 @@ internal class RapidQrCodeCensorTest {
 
     @Test
     fun `checkLog() should return null if nothing should be censored`() = runTest {
-        RapidQrCodeCensor.dataToCensor = RapidQrCodeCensor.CensorData(
-            rawString = testRawString,
-            hash = testHash.replace("8", "9"),
-            firstName = null,
-            lastName = null,
-            dateOfBirth = null
+        RapidQrCodeCensor.dataToCensor.add(
+            RapidQrCodeCensor.CensorData(
+                rawString = testRawString,
+                hash = testHash.replace("8", "9"),
+                firstName = null,
+                lastName = null,
+                dateOfBirth = null
+            )
         )
 
         val censor = createInstance()