chore: add log to track McFly

Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>

Author: vitormattos

lib/Handler/SignEngine/Pkcs12Handler.php

@@ -20,6 +20,7 @@
 use OCP\IL10N;
 use OCP\ITempManager;
 use phpseclib3\File\ASN1;
+use Psr\Log\LoggerInterface;
 
 class Pkcs12Handler extends SignEngineHandler {
 	use OrderCertificatesTrait;
@@ -37,8 +38,9 @@ public function __construct(
 		private IL10N $l10n,
 		private FooterHandler $footerHandler,
 		private ITempManager $tempManager,
+		private LoggerInterface $logger,
 	) {
-		parent::__construct($l10n, $folderService);
+		parent::__construct($l10n, $folderService, $logger);
 	}
 
 	/**

lib/Handler/SignEngine/SignEngineHandler.php

@@ -22,6 +22,7 @@
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use OCP\IL10N;
+use Psr\Log\LoggerInterface;
 
 abstract class SignEngineHandler implements ISignEngineHandler {
 	private File $inputFile;
@@ -35,6 +36,7 @@ abstract class SignEngineHandler implements ISignEngineHandler {
 	public function __construct(
 		private IL10N $l10n,
 		private readonly FolderService $folderService,
+		private LoggerInterface $logger,
 	) {
 	}
 
@@ -217,7 +219,9 @@ public function getLastSignedDate(): \DateTime {
 		}
 
 		// Prevent accepting certificates with future signing dates (possible clock issues)
-		if ($last['signingTime'] > new \DateTime()) {
+		$dateTime = new \DateTime();
+		if ($last['signingTime'] > $dateTime) {
+			$this->logger->error('We found Marty McFly', ['last_signature' => $last['signingTime'], 'current_date_time' => $dateTime]);
 			throw new \UnexpectedValueException('Invalid signingTime in certificate chain. We found Marty McFly');
 		}
 

tests/php/Unit/Handler/SignEngine/Pkcs12HandlerTest.php

@@ -19,6 +19,7 @@
 use OCP\L10N\IFactory as IL10NFactory;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 
 final class Pkcs12HandlerTest extends \OCA\Libresign\Tests\Unit\TestCase {
 	protected Pkcs12Handler $pkcs12Handler;
@@ -27,6 +28,7 @@ final class Pkcs12HandlerTest extends \OCA\Libresign\Tests\Unit\TestCase {
 	private IL10N $l10n;
 	private FooterHandler&MockObject $footerHandler;
 	private ITempManager $tempManager;
+	private LoggerInterface&MockObject $logger;
 	private CertificateEngineFactory&MockObject $certificateEngineFactory;
 
 	public function setUp(): void {
@@ -36,6 +38,7 @@ public function setUp(): void {
 		$this->l10n = \OCP\Server::get(IL10NFactory::class)->get(Application::APP_ID);
 		$this->footerHandler = $this->createMock(FooterHandler::class);
 		$this->tempManager = \OCP\Server::get(ITempManager::class);
+		$this->logger = $this->createMock(LoggerInterface::class);
 	}
 
 	private function getHandler(array $methods = []): Pkcs12Handler|MockObject {
@@ -48,6 +51,7 @@ private function getHandler(array $methods = []): Pkcs12Handler|MockObject {
 					$this->l10n,
 					$this->footerHandler,
 					$this->tempManager,
+					$this->logger,
 				])
 				->onlyMethods($methods)
 				->getMock();
@@ -59,6 +63,7 @@ private function getHandler(array $methods = []): Pkcs12Handler|MockObject {
 			$this->l10n,
 			$this->footerHandler,
 			$this->tempManager,
+			$this->logger,
 		);
 	}
 

tests/php/Unit/Handler/SignEngine/Pkcs7HandlerTest.php

@@ -11,27 +11,32 @@
 use OCP\IL10N;
 use OCP\L10N\IFactory as IL10NFactory;
 use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 
 final class Pkcs7HandlerTest extends \OCA\Libresign\Tests\Unit\TestCase {
 	private IL10N $l10n;
 	private FolderService&MockObject $folderService;
+	private LoggerInterface&MockObject $logger;
 	public function setUp(): void {
 		parent::setUp();
 		$this->l10n = \OCP\Server::get(IL10NFactory::class)->get(\OCA\Libresign\AppInfo\Application::APP_ID);
 		$this->folderService = $this->createMock(\OCA\Libresign\Service\FolderService::class);
+		$this->logger = $this->createMock(LoggerInterface::class);
 	}
 
 	protected function getInstance(array $methods = []): Pkcs7Handler|MockObject {
 		if (empty($methods)) {
 			return new Pkcs7Handler(
 				$this->l10n,
 				$this->folderService,
+				$this->logger,
 			);
 		}
 		return $this->getMockBuilder(Pkcs7Handler::class)
 			->setConstructorArgs([
 				$this->l10n,
 				$this->folderService,
+				$this->logger,
 			])
 			->onlyMethods($methods)
 			->getMock();

tests/php/Unit/Service/IdentifyMethod/PasswordTest.php

@@ -23,6 +23,7 @@
 use OCP\L10N\IFactory as IL10NFactory;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 
 final class PasswordTest extends \OCA\Libresign\Tests\Unit\TestCase {
 	private IdentifyService&MockObject $identifyService;
@@ -34,6 +35,7 @@ final class PasswordTest extends \OCA\Libresign\Tests\Unit\TestCase {
 	private IL10N $l10n;
 	private FooterHandler&MockObject $footerHandler;
 	private ITempManager $tempManager;
+	private LoggerInterface&MockObject $logger;
 
 	public function setUp(): void {
 		$this->identifyService = $this->createMock(IdentifyService::class);
@@ -44,6 +46,7 @@ public function setUp(): void {
 		$this->footerHandler = $this->createMock(FooterHandler::class);
 		$this->tempManager = \OCP\Server::get(ITempManager::class);
 		$this->userSession = $this->createMock(IUserSession::class);
+		$this->logger = $this->createMock(LoggerInterface::class);
 		$this->pkcs12Handler = $this->getPkcs12Instance();
 	}
 
@@ -67,6 +70,7 @@ private function getPkcs12Instance(array $methods = []) {
 				$this->l10n,
 				$this->footerHandler,
 				$this->tempManager,
+				$this->logger,
 			])
 			->onlyMethods($methods)
 			->getMock();