Wrap exceptions

corona-warn-app · Apr 6, 2021 · d1c97a4 · d1c97a4
1 parent 1937040
commit d1c97a4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/...p/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeException.kt b/...p/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeException.kt
@@ -1,7 +1,14 @@
 package de.rki.coronawarnapp.eventregistration.checkins.qrcode
 
-sealed class QRCodeException constructor(message: String? = null) : Exception(message)
+sealed class QRCodeException constructor(
+    message: String? = null,
+    cause: Throwable? = null
+) : Exception(message, cause)
 
 class InvalidQrCodeUriException constructor(message: String? = null) : QRCodeException(message)
-class InvalidQrCodeDataException constructor(message: String? = null) : QRCodeException(message)
+
 class InvalidQrCodePayloadException constructor(message: String? = null) : QRCodeException(message)
+
+class InvalidQrCodeDataException constructor(
+    message: String? = null, cause: Throwable? = null
+) : QRCodeException(message, cause)
diff --git a/...p/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeUriParser.kt b/...p/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeUriParser.kt
@@ -1,12 +1,14 @@
 package de.rki.coronawarnapp.eventregistration.checkins.qrcode
 
+import com.google.common.io.BaseEncoding
 import dagger.Reusable
 import de.rki.coronawarnapp.appconfig.AppConfigProvider
 import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass.QRCodePayload
 import de.rki.coronawarnapp.server.protocols.internal.v2.PresenceTracingParametersOuterClass.PresenceTracingQRCodeDescriptorOrBuilder
 import de.rki.coronawarnapp.server.protocols.internal.v2.PresenceTracingParametersOuterClass.PresenceTracingQRCodeDescriptor.PayloadEncoding
 import de.rki.coronawarnapp.util.decodeBase32
 import okio.ByteString.Companion.decodeBase64
+import okio.ByteString.Companion.toByteString
 import timber.log.Timber
 import java.net.URI
 import javax.inject.Inject
@@ -26,7 +28,12 @@ class QRCodeUriParser @Inject constructor(
     @Suppress("BlockingMethodInNonBlockingContext")
     suspend fun getQrCodePayload(input: String): QRCodePayload {
         Timber.d("input=$input")
-        URI.create(input) // Verify it is a valid uri
+        try {
+            URI.create(input) // Verify it is a valid uri
+        } catch (e: Exception) {
+            Timber.d(e, "Invalid URI")
+            throw InvalidQrCodeUriException("Invalid URI")
+        }
 
         val descriptor = descriptor(input)
         val groups = descriptor.matchedGroups(input)
@@ -37,10 +44,15 @@ class QRCodeUriParser @Inject constructor(
         val encoding = PayloadEncoding.forNumber(descriptor.payloadEncoding.number)
         Timber.d("encoding=$encoding")
 
-        val rawPayload = when (encoding) {
-            PayloadEncoding.BASE32 -> payload.decodeBase32()
-            PayloadEncoding.BASE64 -> payload.decodeBase64()
-            else -> null
+        val rawPayload = try {
+            when (encoding) {
+                PayloadEncoding.BASE32 -> payload.decodeBase32()
+                PayloadEncoding.BASE64 -> BaseEncoding.base64Url().decode(payload).toByteString()
+                else -> null
+            }
+        } catch (e: Exception) {
+            Timber.d(e, "Payload decoding failed")
+            throw InvalidQrCodeDataException("Payload decoding failed", e)
         } ?: throw InvalidQrCodeDataException("Payload decoding failed")
 
         return QRCodePayload.parseFrom(rawPayload.toByteArray())