Merge pull request #7614 from LibreSign/backport/7612/stable33

[stable33] refactor: signer TSA component and simplify CRL validation messaging

Author: vitormattos

lib/Db/CrlMapper.php

@@ -90,6 +90,7 @@ public function revokeCertificate(
 		?string $revokedBy = null,
 		?DateTime $invalidityDate = null,
 		?int $crlNumber = null,
+		?DateTime $revokedAt = null,
 	): Crl {
 		$certificate = $this->findBySerialNumber($serialNumber);
 		return $this->revokeCertificateEntity(
@@ -98,7 +99,8 @@ public function revokeCertificate(
 			$comment,
 			$revokedBy,
 			$invalidityDate,
-			$crlNumber
+			$crlNumber,
+			$revokedAt,
 		);
 	}
 
@@ -109,6 +111,7 @@ public function revokeCertificateEntity(
 		?string $revokedBy = null,
 		?DateTime $invalidityDate = null,
 		?int $crlNumber = null,
+		?DateTime $revokedAt = null,
 	): Crl {
 		if (CRLStatus::from($certificate->getStatus()) !== CRLStatus::ISSUED) {
 			throw new \InvalidArgumentException('Certificate is not in issued status');
@@ -118,7 +121,7 @@ public function revokeCertificateEntity(
 		$certificate->setReasonCode($reason->value);
 		$certificate->setComment($comment !== '' ? $comment : null);
 		$certificate->setRevokedBy($revokedBy);
-		$certificate->setRevokedAt(new DateTime());
+		$certificate->setRevokedAt($revokedAt ?? new DateTime());
 		$certificate->setInvalidityDate($invalidityDate);
 		$certificate->setCrlNumber($crlNumber);
 

lib/Listener/RevokeClickToSignCertificateListener.php

@@ -9,6 +9,7 @@
 
 namespace OCA\Libresign\Listener;
 
+use DateTime;
 use OCA\Libresign\Enum\CRLReason;
 use OCA\Libresign\Events\SignedEvent;
 use OCA\Libresign\Service\Crl\CrlService;
@@ -47,7 +48,9 @@ public function handle(Event $event): void {
 			$serialNumber,
 			CRLReason::SUPERSEDED,
 			'Temporary certificate issued for click-to-sign. Automatically revoked after document signing.',
-			'system'
+			'system',
+			null,
+			new DateTime('+1 second'),
 		);
 
 		if ($success) {

lib/Service/Crl/CrlService.php

@@ -60,6 +60,7 @@ public function revokeCertificate(
 		?string $reasonText = null,
 		?string $revokedBy = null,
 		?DateTime $invalidityDate = null,
+		?DateTime $revokedAt = null,
 	): bool {
 
 		try {
@@ -73,7 +74,8 @@ public function revokeCertificate(
 				$reasonText,
 				$revokedBy,
 				$invalidityDate,
-				$crlNumber
+				$crlNumber,
+				$revokedAt,
 			);
 
 			return true;