Merge pull request #1278 from nextcloud/backport/1212/stable30

[stable30] fix: do error on upload when a tag is not found anymore

Author: blizzz

lib/AppInfo/Application.php

@@ -14,7 +14,6 @@
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\Files\Cache\CacheEntryInsertedEvent;
 use OCP\Files\Cache\CacheEntryUpdatedEvent;
 use OCP\WorkflowEngine\Events\RegisterOperationsEvent;
 
@@ -26,7 +25,6 @@ public function __construct() {
 	}
 
 	public function register(IRegistrationContext $context): void {
-		$context->registerEventListener(CacheEntryInsertedEvent::class, CacheListener::class);
 		$context->registerEventListener(CacheEntryUpdatedEvent::class, CacheListener::class);
 
 		$context->registerEventListener(RegisterOperationsEvent::class, RegisterFlowOperationsListener::class);

lib/Operation.php

@@ -31,10 +31,13 @@
 use OCP\WorkflowEngine\IManager;
 use OCP\WorkflowEngine\IRuleMatcher;
 use OCP\WorkflowEngine\ISpecificOperation;
+use Psr\Log\LoggerInterface;
 use RuntimeException;
 use UnexpectedValueException;
 
 class Operation implements ISpecificOperation, IComplexOperation {
+	protected array $issuedTagNotFoundWarnings = [];
+
 	public function __construct(
 		protected readonly ISystemTagObjectMapper $objectMapper,
 		protected readonly ISystemTagManager $tagManager,
@@ -46,7 +49,8 @@ public function __construct(
 		protected readonly IRootFolder $rootFolder,
 		protected readonly File $fileEntity,
 		protected readonly IUserSession $userSession,
-		protected readonly IGroupManager $groupManager
+		protected readonly IGroupManager $groupManager,
+		protected readonly LoggerInterface $logger,
 	) {
 	}
 
@@ -64,7 +68,19 @@ public function checkOperations(IStorage $storage, int $fileId, string $file): v
 		$matches = $matcher->getFlows(false);
 
 		foreach ($matches as $match) {
-			$this->objectMapper->assignTags((string) $fileId, 'files', explode(',', $match['operation']));
+			try {
+				$this->objectMapper->assignTags((string)$fileId, 'files', explode(',', $match['operation']));
+			} catch (TagNotFoundException $e) {
+				$msg = sprintf('The tag to assign (ID %s) cannot be found anymore. The related rule is %s.',
+					$match['operation'],
+					$match['scope_type'] === 0 ? 'global' : 'owned by ' . $match['scope_actor_id']
+				);
+				if (isset($this->issuedTagNotFoundWarnings[md5($msg)])) {
+					continue;
+				}
+				$this->issuedTagNotFoundWarnings[md5($msg)] = true;
+				$this->logger->error($msg);
+			}
 		}
 	}
 

tests/OperationTest.php

@@ -30,6 +30,7 @@
 use OCP\WorkflowEngine\IManager;
 use OCP\WorkflowEngine\IRuleMatcher;
 use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class OperationTest extends TestCase {
@@ -45,6 +46,7 @@ class OperationTest extends TestCase {
 	protected \OCA\WorkflowEngine\Entity\File&MockObject $fileEntity;
 	protected IUserSession&MockObject $userSession;
 	protected IGroupManager&MockObject $groupManager;
+	protected LoggerInterface&MockObject $logger;
 	protected Operation $operation;
 
 	protected function setUp(): void {
@@ -62,6 +64,7 @@ protected function setUp(): void {
 		$this->fileEntity = $this->createMock(\OCA\WorkflowEngine\Entity\File::class);
 		$this->userSession = $this->createMock(IUserSession::class);
 		$this->groupManager = $this->createMock(IGroupManager::class);
+		$this->logger = $this->createMock(LoggerInterface::class);
 
 		$this->checkManager->expects($this->any())
 			->method('getRuleMatcher')
@@ -81,7 +84,8 @@ protected function setUp(): void {
 			$this->rootFolder,
 			$this->fileEntity,
 			$this->userSession,
-			$this->groupManager
+			$this->groupManager,
+			$this->logger,
 		);
 	}