fix(smime): surface unparseable stored certificates instead of crashing

lib/Controller/PageController.php

@@ -16,6 +16,8 @@
 use OCA\Mail\Contracts\IUserPreferences;
 use OCA\Mail\Db\SmimeCertificate;
 use OCA\Mail\Db\TagMapper;
+use OCA\Mail\Exception\SmimeCertificateParserException;
+use OCA\Mail\Model\EnrichedSmimeCertificate;
 use OCA\Mail\Service\AccountService;
 use OCA\Mail\Service\AiIntegrations\AiIntegrationsService;
 use OCA\Mail\Service\AliasesService;
@@ -364,7 +366,18 @@ public function index(): TemplateResponse {
 		$this->initialStateService->provideInitialState(
 			'smime-certificates',
 			array_map(
-				fn (SmimeCertificate $certificate) => $this->smimeService->enrichCertificate($certificate),
+				function (SmimeCertificate $certificate) {
+					try {
+						return $this->smimeService->enrichCertificate($certificate);
+					} catch (SmimeCertificateParserException $e) {
+						$this->logger->warning('S/MIME certificate {id} cannot be parsed: {message}', [
+							'id' => $certificate->getId(),
+							'message' => $e->getMessage(),
+							'exception' => $e,
+						]);
+						return new EnrichedSmimeCertificate($certificate, null, $e->getMessage());
+					}
+				},
 				$this->smimeService->findAllCertificates($user->getUID()),
 			),
 		);

lib/Controller/SmimeCertificatesController.php

@@ -13,6 +13,7 @@
 use OCA\Mail\Exception\ServiceException;
 use OCA\Mail\Exception\SmimeCertificateParserException;
 use OCA\Mail\Http\JsonResponse;
+use OCA\Mail\Model\EnrichedSmimeCertificate;
 use OCA\Mail\Http\TrapError;
 use OCA\Mail\Service\Attachment\UploadedFile;
 use OCA\Mail\Service\SmimeService;
@@ -49,7 +50,16 @@ public function index(): JsonResponse {
 		}
 
 		$certificates = $this->certificateService->findAllCertificates($this->userId);
-		$certificates = array_map(fn (SmimeCertificate $certificate) => $this->certificateService->enrichCertificate($certificate), $certificates);
+		$certificates = array_map(
+			function (SmimeCertificate $certificate) {
+				try {
+					return $this->certificateService->enrichCertificate($certificate);
+				} catch (SmimeCertificateParserException $e) {
+					return new EnrichedSmimeCertificate($certificate, null, $e->getMessage());
+				}
+			},
+			$certificates,
+		);
 		return JsonResponse::success($certificates);
 	}
 
@@ -130,7 +140,11 @@ public function create(): JsonResponse {
 			$certificateData,
 			$privateKeyData,
 		);
-		$enrichedCertificate = $this->certificateService->enrichCertificate($certificate);
+		try {
+			$enrichedCertificate = $this->certificateService->enrichCertificate($certificate);
+		} catch (SmimeCertificateParserException $e) {
+			$enrichedCertificate = new EnrichedSmimeCertificate($certificate, null, $e->getMessage());
+		}
 		return JsonResponse::success($enrichedCertificate);
 	}
 }

lib/Model/EnrichedSmimeCertificate.php

@@ -15,50 +15,43 @@
 
 class EnrichedSmimeCertificate implements JsonSerializable {
 	private SmimeCertificate $certificate;
-	private SmimeCertificateInfo $info;
+	private ?SmimeCertificateInfo $info;
+	private ?string $error;
 
-	/**
-	 * @param SmimeCertificate $certificate
-	 * @param SmimeCertificateInfo $info
-	 */
-	public function __construct(SmimeCertificate $certificate, SmimeCertificateInfo $info) {
+	public function __construct(SmimeCertificate $certificate,
+		?SmimeCertificateInfo $info,
+		?string $error = null) {
 		$this->certificate = $certificate;
 		$this->info = $info;
+		$this->error = $error;
 	}
 
-	/**
-	 * @return SmimeCertificate
-	 */
 	public function getCertificate(): SmimeCertificate {
 		return $this->certificate;
 	}
 
-	/**
-	 * @param SmimeCertificate $certificate
-	 */
 	public function setCertificate(SmimeCertificate $certificate): void {
 		$this->certificate = $certificate;
 	}
 
-	/**
-	 * @return SmimeCertificateInfo
-	 */
-	public function getInfo(): SmimeCertificateInfo {
+	public function getInfo(): ?SmimeCertificateInfo {
 		return $this->info;
 	}
 
-	/**
-	 * @param SmimeCertificateInfo $info
-	 */
-	public function setInfo(SmimeCertificateInfo $info): void {
+	public function setInfo(?SmimeCertificateInfo $info): void {
 		$this->info = $info;
 	}
 
+	public function getError(): ?string {
+		return $this->error;
+	}
+
 	#[\Override]
 	#[ReturnTypeWillChange]
 	public function jsonSerialize() {
 		$json = $this->certificate->jsonSerialize();
-		$json['info'] = $this->info->jsonSerialize();
+		$json['info'] = $this->info?->jsonSerialize();
+		$json['error'] = $this->error;
 		return $json;
 	}
 }

src/components/CertificateSettings.vue

@@ -118,7 +118,8 @@ export default {
 			const now = (new Date().getTime() / 1000) + 3600 * 24
 			const certs = this.smimeCertificates
 				.filter((cert) => {
-					return cert.hasKey
+					return cert.info
+						&& cert.hasKey
 						&& cert.emailAddress === this.alias.alias
 						&& cert.info.notAfter >= now
 						&& cert.info.purposes.sign

src/components/smime/SmimeCertificateModal.vue

@@ -20,14 +20,14 @@
 					</thead>
 					<tbody>
 						<tr v-for="certificate in certificates" :key="certificate.id">
-							<td :title="certificate.info.commonName">
-								{{ certificate.info.commonName }}
+							<td :title="certificate.info ? certificate.info.commonName : t('mail', 'Invalid certificate')">
+								{{ certificate.info ? certificate.info.commonName : t('mail', 'Invalid certificate') }}
 							</td>
-							<td :title="certificate.info.emailAddress">
-								{{ certificate.info.emailAddress }}
+							<td :title="certificate.info ? certificate.info.emailAddress : certificate.error">
+								{{ certificate.info ? certificate.info.emailAddress : certificate.error }}
 							</td>
-							<td :title="moment.unix(certificate.info.notAfter).format('LL')">
-								{{ moment.unix(certificate.info.notAfter).format('LL') }}
+							<td :title="certificate.info ? moment.unix(certificate.info.notAfter).format('LL') : '—'">
+								{{ certificate.info ? moment.unix(certificate.info.notAfter).format('LL') : '—' }}
 							</td>
 							<td>
 								<NcButton