Added limitation for QR bytes amount: admin-ch/CovidCertificate-App-A…

…ndroid#60 (#94)
eu-digital-green-certificates · Jul 27, 2021 · 8edef54 · 8edef54
1 parent 8d1a9bf
commit 8edef54
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/.idea/sonarlint/issuestore/2/f/2f8371ba41afcb67d9051946cc189a09643637be b/.idea/sonarlint/issuestore/2/f/2f8371ba41afcb67d9051946cc189a09643637be
diff --git a/.idea/sonarlint/issuestore/7/b/7bbea943dc2077e68f09568eca397dbf74cd622d b/.idea/sonarlint/issuestore/7/b/7bbea943dc2077e68f09568eca397dbf74cd622d
diff --git a/.idea/sonarlint/issuestore/b/7/b73af1a45eb4e13c946a7f69475a41669caeb2bf b/.idea/sonarlint/issuestore/b/7/b73af1a45eb4e13c946a7f69475a41669caeb2bf
diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb
diff --git a/app/src/main/java/dgca/wallet/app/android/certificate/claim/ClaimCertificateViewModel.kt b/app/src/main/java/dgca/wallet/app/android/certificate/claim/ClaimCertificateViewModel.kt
@@ -75,7 +75,7 @@ class ClaimCertificateViewModel @Inject constructor(
     private val _event = MutableLiveData<Event<ClaimCertEvent>>()
     val event: LiveData<Event<ClaimCertEvent>> = _event
 
-    private var cose = ByteArray(0)
+    private var cose: ByteArray = ByteArray(0)
     private var greenCertificate: GreenCertificate? = null
 
     fun init(qrCodeText: String) {
@@ -85,7 +85,13 @@ class ClaimCertificateViewModel @Inject constructor(
                 val verificationResult = VerificationResult()
                 val plainInput = prefixValidationService.decode(qrCodeText, verificationResult)
                 val compressedCose = base45Service.decode(plainInput, verificationResult)
-                cose = compressorService.decode(compressedCose, verificationResult)
+                val coseResult: ByteArray? = compressorService.decode(compressedCose, verificationResult)
+
+                if (coseResult == null) {
+                    Timber.d("Verification failed: Too many bytes read")
+                    return@withContext
+                }
+                cose = coseResult
 
                 val coseData = coseService.decode(cose, verificationResult)
                 if (coseData == null) {

diff --git a/.../java/dgca/wallet/app/android/certificate/view/validity/rules/RulesValidationViewModel.kt b/.../java/dgca/wallet/app/android/certificate/view/validity/rules/RulesValidationViewModel.kt
@@ -74,9 +74,9 @@ class RulesValidationViewModel @Inject constructor(
                 val verificationResult = VerificationResult()
                 val plainInput = prefixValidationService.decode(qrCodeText, verificationResult)
                 val compressedCose = base45Service.decode(plainInput, verificationResult)
-                val cose = compressorService.decode(compressedCose, verificationResult)
+                val cose: ByteArray? = compressorService.decode(compressedCose, verificationResult)
 
-                val coseData: CoseData? = coseService.decode(cose, verificationResult)
+                val coseData: CoseData? = cose?.let { coseService.decode(cose, verificationResult) }
                 val greenCertificateData: GreenCertificateData? =
                     coseData?.let { cborService.decodeData(it.cbor, verificationResult) }
                 val base64EncodedKid: String? = coseData?.kid?.toBase64()