Merge pull request #1126 from nextcloud/fix/moving-across-share-bound…

…aries

fix(FileListener): Listen to file movements across share boundaries

.github/workflows/lint-php-cs.yml

@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Set up php
-        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+        uses: shivammathur/setup-php@v2 # v2
         with:
           php-version: 8.1
           coverage: none
@@ -43,7 +43,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies
-        run: composer i
+        run: |
+          composer i
+          composer i
 
       - name: Lint
         run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )

.github/workflows/lint-php.yml

@@ -46,7 +46,7 @@ jobs:
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+        uses: shivammathur/setup-php@v2 # v2
         with:
           php-version: ${{ matrix.php-versions }}
           coverage: none

.github/workflows/phpunit-mysql.yml

@@ -70,7 +70,7 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+        uses: shivammathur/setup-php@v2 # v2
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/phpunit-pgsql.yml

@@ -73,7 +73,7 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+        uses: shivammathur/setup-php@v2 # v2
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/phpunit-sqlite.yml

@@ -63,7 +63,7 @@ jobs:
           path: apps/${{ env.APP_NAME }}
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+        uses: shivammathur/setup-php@v2 # v2
         with:
           php-version: ${{ matrix.php-versions }}
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/psalm.yml

@@ -40,7 +40,7 @@ jobs:
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Set up php
-        uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2
+        uses: shivammathur/setup-php@v2 # v2
         with:
           php-version: ${{ matrix.php-versions }}
           coverage: none

tests/ClassifierTest.php

@@ -32,6 +32,7 @@
  */
 class ClassifierTest extends TestCase {
 	public const TEST_USER1 = 'test-user1';
+	public const TEST_USER2 = 'test-user2';
 
 	public const TEST_FILES = ['alpine.jpg' ,'eiffeltower.jpg', 'Rock_Rejam.mp3', 'jumpingjack.gif', 'test'];
 	public const ALL_MODELS = [
@@ -58,11 +59,13 @@ class ClassifierTest extends TestCase {
 	private FaceDetectionMapper $faceDetectionMapper;
 	private IJobList $jobList;
 	private IAppConfig $config;
+	private \OCP\Share\IManager $shareManager;
 
 	public static function setUpBeforeClass(): void {
 		parent::setUpBeforeClass();
 		$backend = new \Test\Util\User\Dummy();
 		$backend->createUser(self::TEST_USER1, self::TEST_USER1);
+		$backend->createUser(self::TEST_USER2, self::TEST_USER2);
 		\OC::$server->get(\OCP\IUserManager::class)->registerBackend($backend);
 	}
 
@@ -79,6 +82,7 @@ public function setUp(): void {
 		$this->jobList = \OC::$server->get(IJobList::class);
 		$this->config = \OC::$server->getRegisteredAppContainer('recognize')->get(IAppConfig::class);
 		$this->queue = \OC::$server->get(QueueService::class);
+		$this->shareManager = \OC::$server->get(\OCP\Share\IManager::class);
 		foreach (self::TEST_FILES as $filename) {
 			try {
 				$this->userFolder->get($filename)->delete();
@@ -483,6 +487,26 @@ public function testFacesPipeline() : void {
 				}
 			}
 		}
+
+		// Test FileListener for moving files across share boundaries
+
+		self::assertCount(0, $this->faceDetectionMapper->findByUserId(self::TEST_USER2), 'user 2 should have no face detections');
+
+		$sharedFolder = $this->userFolder->newFolder('/shared/');
+		$share = $this->shareManager->newShare();
+		$share->setSharedBy(self::TEST_USER1);
+		$share->setSharedWith(self::TEST_USER2);
+		$share->setShareType(\OCP\Share\IShare::TYPE_USER);
+		$share->setNode($sharedFolder);
+		$share->setPermissions(\OCP\Constants::PERMISSION_ALL);
+		$this->shareManager->createShare($share);
+		$this->shareManager->acceptShare($share, self::TEST_USER2);
+
+		$testFiles[0]->move($sharedFolder->getPath().'/'.$testFiles[0]->getName());
+
+		self::assertCount(1, $this->faceDetectionMapper->findByUserId(self::TEST_USER2), 'user 2 should have 1 face detection now');
+		$this->shareManager->deleteShare($share);
+		self::assertCount(0, $this->faceDetectionMapper->findByUserId(self::TEST_USER2), 'user 2 should have 0 face detections after deleting the share');
 	}
 
 	/**