Prefer Either.catch over try/catch rethrowing CancellationException

eu-digital-identity-wallet · Dec 17, 2024 · 9e475ae · 9e475ae
1 parent c52d1cf
commit 9e475ae
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/src/main/kotlin/eu/europa/ec/eudi/verifier/endpoint/port/input/ValidateSdJwtVc.kt b/src/main/kotlin/eu/europa/ec/eudi/verifier/endpoint/port/input/ValidateSdJwtVc.kt
@@ -15,15 +15,15 @@
  */
 package eu.europa.ec.eudi.verifier.endpoint.port.input
 
+import arrow.core.Either
+import arrow.core.getOrElse
 import arrow.core.toNonEmptyListOrNull
-import com.nimbusds.jose.proc.BadJOSEException
 import eu.europa.ec.eudi.sdjwt.*
 import eu.europa.ec.eudi.sdjwt.vc.SdJwtVcVerifier
 import eu.europa.ec.eudi.sdjwt.vc.X509CertificateTrust
 import eu.europa.ec.eudi.verifier.endpoint.adapter.out.cert.X5CShouldBe
 import eu.europa.ec.eudi.verifier.endpoint.adapter.out.cert.X5CValidator
 import eu.europa.ec.eudi.verifier.endpoint.domain.Nonce
-import kotlinx.coroutines.CancellationException
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.buildJsonObject
@@ -103,22 +103,21 @@ internal class ValidateSdJwtVc(
             put(Claims.Nonce, nonce.value)
         }
 
-        return try {
+        return Either.catch {
             val (presentation, keyBinding) = verifier.verifyPresentation(unverified, challenge).getOrThrow()
             checkNotNull(keyBinding) { "KeyBinding JWT cannot be null" }
 
             val payload = with(DefaultSdJwtOps) {
                 presentation.recreateClaims(visitor = null)
             }
             SdJwtVcValidationResult.Valid(payload)
-        } catch (cancellation: CancellationException) {
-            throw cancellation
-        } catch (verificationError: SdJwtVerificationException) {
-            log.error("SD-JWT-VC validation failed", verificationError)
-            SdJwtVcValidationResult.Invalid(verificationError.toSdJwtVcValidationErrorTO())
-        } catch (badJoseError: BadJOSEException) {
-            log.error("SD-JWT-VC validation failed", badJoseError)
-            SdJwtVcValidationResult.Invalid(SdJwtVcValidationErrorTO.Other)
+        }.getOrElse {
+            log.error("SD-JWT-VC validation failed", it)
+            if (it is SdJwtVerificationException) {
+                SdJwtVcValidationResult.Invalid(it.toSdJwtVcValidationErrorTO())
+            } else {
+                SdJwtVcValidationResult.Invalid(SdJwtVcValidationErrorTO.Other)
+            }
         }
     }
 }