nextcloud / server

apps/files_sharing/tests/ExpireSharesJobTest.php

Indentation +173 added lines, -173 removed lines

@@ -26,177 +26,177 @@
 #[\PHPUnit\Framework\Attributes\Group('DB')]
 class ExpireSharesJobTest extends \Test\TestCase {
 
-	/** @var ExpireSharesJob */
-	private $job;
-
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var string */
-	private $user1;
-
-	/** @var string */
-	private $user2;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->connection = Server::get(IDBConnection::class);
-		// clear occasional leftover shares from other tests
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('share')->executeStatement();
-
-		$this->user1 = $this->getUniqueID('user1_');
-		$this->user2 = $this->getUniqueID('user2_');
-
-		$userManager = Server::get(IUserManager::class);
-		$userManager->createUser($this->user1, 'longrandompassword');
-		$userManager->createUser($this->user2, 'longrandompassword');
-
-		\OC::registerShareHooks(Server::get(SystemConfig::class));
-
-		$this->job = new ExpireSharesJob(Server::get(ITimeFactory::class), Server::get(IManager::class), $this->connection);
-	}
-
-	protected function tearDown(): void {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('share')->executeStatement();
-
-		$userManager = Server::get(IUserManager::class);
-		$user1 = $userManager->get($this->user1);
-		if ($user1) {
-			$user1->delete();
-		}
-		$user2 = $userManager->get($this->user2);
-		if ($user2) {
-			$user2->delete();
-		}
-
-		$this->logout();
-
-		parent::tearDown();
-	}
-
-	private function getShares() {
-		$shares = [];
-		$qb = $this->connection->getQueryBuilder();
-
-		$result = $qb->select('*')
-			->from('share')
-			->executeQuery();
-
-		while ($row = $result->fetchAssociative()) {
-			$shares[] = $row;
-		}
-		$result->closeCursor();
-		return $shares;
-	}
-
-	public static function dataExpireLinkShare() {
-		return [
-			[false,   '', false, false],
-			[false,   '',  true, false],
-			[true, 'P1D', false,  true],
-			[true, 'P1D',  true, false],
-			[true, 'P1W', false,  true],
-			[true, 'P1W',  true, false],
-			[true, 'P1M', false,  true],
-			[true, 'P1M',  true, false],
-			[true, 'P1Y', false,  true],
-			[true, 'P1Y',  true, false],
-		];
-	}
-
-	/**
-	 *
-	 * @param bool addExpiration Should we add an expire date
-	 * @param string $interval The dateInterval
-	 * @param bool $addInterval If true add to the current time if false subtract
-	 * @param bool $shouldExpire Should this share be expired
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataExpireLinkShare')]
-	public function testExpireLinkShare($addExpiration, $interval, $addInterval, $shouldExpire): void {
-		$this->loginAsUser($this->user1);
-
-		$user1Folder = \OC::$server->getUserFolder($this->user1);
-		$testFolder = $user1Folder->newFolder('test');
-
-		$shareManager = Server::get(\OCP\Share\IManager::class);
-		$share = $shareManager->newShare();
-
-		$share->setNode($testFolder)
-			->setShareType(IShare::TYPE_LINK)
-			->setPermissions(Constants::PERMISSION_READ)
-			->setSharedBy($this->user1);
-
-		$shareManager->createShare($share);
-
-		$shares = $this->getShares();
-		$this->assertCount(1, $shares);
-		reset($shares);
-		$share = current($shares);
-
-		if ($addExpiration) {
-			$expire = new \DateTime();
-			$expire->setTime(0, 0, 0);
-			if ($addInterval) {
-				$expire->add(new \DateInterval($interval));
-			} else {
-				$expire->sub(new \DateInterval($interval));
-			}
-			$expire = $expire->format('Y-m-d 00:00:00');
-
-			// Set expiration date to yesterday
-			$qb = $this->connection->getQueryBuilder();
-			$qb->update('share')
-				->set('expiration', $qb->createParameter('expiration'))
-				->where($qb->expr()->eq('id', $qb->createParameter('id')))
-				->setParameter('id', $share['id'])
-				->setParameter('expiration', $expire)
-				->executeStatement();
-
-			$shares = $this->getShares();
-			$this->assertCount(1, $shares);
-		}
-
-		$this->logout();
-
-		$this->job->run([]);
-
-		$shares = $this->getShares();
-
-		if ($shouldExpire) {
-			$this->assertCount(0, $shares);
-		} else {
-			$this->assertCount(1, $shares);
-		}
-	}
-
-	public function testDoNotExpireOtherShares(): void {
-		$this->loginAsUser($this->user1);
-
-		$user1Folder = \OC::$server->getUserFolder($this->user1);
-		$testFolder = $user1Folder->newFolder('test');
-
-		$shareManager = Server::get(\OCP\Share\IManager::class);
-		$share = $shareManager->newShare();
-
-		$share->setNode($testFolder)
-			->setShareType(IShare::TYPE_USER)
-			->setPermissions(Constants::PERMISSION_READ)
-			->setSharedBy($this->user1)
-			->setSharedWith($this->user2);
-
-		$shareManager->createShare($share);
-
-		$shares = $this->getShares();
-		$this->assertCount(1, $shares);
-
-		$this->logout();
-
-		$this->job->run([]);
-
-		$shares = $this->getShares();
-		$this->assertCount(1, $shares);
-	}
+    /** @var ExpireSharesJob */
+    private $job;
+
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var string */
+    private $user1;
+
+    /** @var string */
+    private $user2;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->connection = Server::get(IDBConnection::class);
+        // clear occasional leftover shares from other tests
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('share')->executeStatement();
+
+        $this->user1 = $this->getUniqueID('user1_');
+        $this->user2 = $this->getUniqueID('user2_');
+
+        $userManager = Server::get(IUserManager::class);
+        $userManager->createUser($this->user1, 'longrandompassword');
+        $userManager->createUser($this->user2, 'longrandompassword');
+
+        \OC::registerShareHooks(Server::get(SystemConfig::class));
+
+        $this->job = new ExpireSharesJob(Server::get(ITimeFactory::class), Server::get(IManager::class), $this->connection);
+    }
+
+    protected function tearDown(): void {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('share')->executeStatement();
+
+        $userManager = Server::get(IUserManager::class);
+        $user1 = $userManager->get($this->user1);
+        if ($user1) {
+            $user1->delete();
+        }
+        $user2 = $userManager->get($this->user2);
+        if ($user2) {
+            $user2->delete();
+        }
+
+        $this->logout();
+
+        parent::tearDown();
+    }
+
+    private function getShares() {
+        $shares = [];
+        $qb = $this->connection->getQueryBuilder();
+
+        $result = $qb->select('*')
+            ->from('share')
+            ->executeQuery();
+
+        while ($row = $result->fetchAssociative()) {
+            $shares[] = $row;
+        }
+        $result->closeCursor();
+        return $shares;
+    }
+
+    public static function dataExpireLinkShare() {
+        return [
+            [false,   '', false, false],
+            [false,   '',  true, false],
+            [true, 'P1D', false,  true],
+            [true, 'P1D',  true, false],
+            [true, 'P1W', false,  true],
+            [true, 'P1W',  true, false],
+            [true, 'P1M', false,  true],
+            [true, 'P1M',  true, false],
+            [true, 'P1Y', false,  true],
+            [true, 'P1Y',  true, false],
+        ];
+    }
+
+    /**
+     *
+     * @param bool addExpiration Should we add an expire date
+     * @param string $interval The dateInterval
+     * @param bool $addInterval If true add to the current time if false subtract
+     * @param bool $shouldExpire Should this share be expired
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataExpireLinkShare')]
+    public function testExpireLinkShare($addExpiration, $interval, $addInterval, $shouldExpire): void {
+        $this->loginAsUser($this->user1);
+
+        $user1Folder = \OC::$server->getUserFolder($this->user1);
+        $testFolder = $user1Folder->newFolder('test');
+
+        $shareManager = Server::get(\OCP\Share\IManager::class);
+        $share = $shareManager->newShare();
+
+        $share->setNode($testFolder)
+            ->setShareType(IShare::TYPE_LINK)
+            ->setPermissions(Constants::PERMISSION_READ)
+            ->setSharedBy($this->user1);
+
+        $shareManager->createShare($share);
+
+        $shares = $this->getShares();
+        $this->assertCount(1, $shares);
+        reset($shares);
+        $share = current($shares);
+
+        if ($addExpiration) {
+            $expire = new \DateTime();
+            $expire->setTime(0, 0, 0);
+            if ($addInterval) {
+                $expire->add(new \DateInterval($interval));
+            } else {
+                $expire->sub(new \DateInterval($interval));
+            }
+            $expire = $expire->format('Y-m-d 00:00:00');
+
+            // Set expiration date to yesterday
+            $qb = $this->connection->getQueryBuilder();
+            $qb->update('share')
+                ->set('expiration', $qb->createParameter('expiration'))
+                ->where($qb->expr()->eq('id', $qb->createParameter('id')))
+                ->setParameter('id', $share['id'])
+                ->setParameter('expiration', $expire)
+                ->executeStatement();
+
+            $shares = $this->getShares();
+            $this->assertCount(1, $shares);
+        }
+
+        $this->logout();
+
+        $this->job->run([]);
+
+        $shares = $this->getShares();
+
+        if ($shouldExpire) {
+            $this->assertCount(0, $shares);
+        } else {
+            $this->assertCount(1, $shares);
+        }
+    }
+
+    public function testDoNotExpireOtherShares(): void {
+        $this->loginAsUser($this->user1);
+
+        $user1Folder = \OC::$server->getUserFolder($this->user1);
+        $testFolder = $user1Folder->newFolder('test');
+
+        $shareManager = Server::get(\OCP\Share\IManager::class);
+        $share = $shareManager->newShare();
+
+        $share->setNode($testFolder)
+            ->setShareType(IShare::TYPE_USER)
+            ->setPermissions(Constants::PERMISSION_READ)
+            ->setSharedBy($this->user1)
+            ->setSharedWith($this->user2);
+
+        $shareManager->createShare($share);
+
+        $shares = $this->getShares();
+        $this->assertCount(1, $shares);
+
+        $this->logout();
+
+        $this->job->run([]);
+
+        $shares = $this->getShares();
+        $this->assertCount(1, $shares);
+    }
 }

apps/files_sharing/tests/Migration/SetPasswordColumnTest.php

Indentation +83 added lines, -83 removed lines

@@ -21,87 +21,87 @@
 #[\PHPUnit\Framework\Attributes\Group('DB')]
 class SetPasswordColumnTest extends TestCase {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	private $config;
-
-	/** @var SetPasswordColumn */
-	private $migration;
-
-	private $table = 'share';
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->connection = Server::get(IDBConnection::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->migration = new SetPasswordColumn($this->connection, $this->config);
-
-		$this->cleanDB();
-	}
-
-	protected function tearDown(): void {
-		parent::tearDown();
-		$this->cleanDB();
-	}
-
-	private function cleanDB() {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($this->table)->executeStatement();
-	}
-
-	public function testAddPasswordColumn(): void {
-		$this->config->expects($this->once())
-			->method('getAppValue')
-			->with('files_sharing', 'installed_version', '0.0.0')
-			->willReturn('1.3.0');
-
-		$shareTypes = [IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_REMOTE, IShare::TYPE_EMAIL, IShare::TYPE_LINK];
-
-		foreach ($shareTypes as $shareType) {
-			for ($i = 0; $i < 5; $i++) {
-				$query = $this->connection->getQueryBuilder();
-				$query->insert($this->table)
-					->values([
-						'share_type' => $query->createNamedParameter($shareType),
-						'share_with' => $query->createNamedParameter('shareWith'),
-						'uid_owner' => $query->createNamedParameter('user' . $i),
-						'uid_initiator' => $query->createNamedParameter(null),
-						'parent' => $query->createNamedParameter(0),
-						'item_type' => $query->createNamedParameter('file'),
-						'item_source' => $query->createNamedParameter('2'),
-						'item_target' => $query->createNamedParameter('/2'),
-						'file_source' => $query->createNamedParameter(2),
-						'file_target' => $query->createNamedParameter('/foobar'),
-						'permissions' => $query->createNamedParameter(31),
-						'stime' => $query->createNamedParameter(time()),
-					]);
-
-				$this->assertSame(1, $query->executeStatement());
-			}
-		}
-
-		/** @var IOutput $output */
-		$output = $this->createMock(IOutput::class);
-		$this->migration->run($output);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('share');
-		$result = $query->executeQuery();
-		$allShares = $result->fetchAllAssociative();
-		$result->closeCursor();
-
-		foreach ($allShares as $share) {
-			if ((int)$share['share_type'] === IShare::TYPE_LINK) {
-				$this->assertNull($share['share_with']);
-				$this->assertSame('shareWith', $share['password']);
-			} else {
-				$this->assertSame('shareWith', $share['share_with']);
-				$this->assertNull($share['password']);
-			}
-		}
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
+    private $config;
+
+    /** @var SetPasswordColumn */
+    private $migration;
+
+    private $table = 'share';
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->connection = Server::get(IDBConnection::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->migration = new SetPasswordColumn($this->connection, $this->config);
+
+        $this->cleanDB();
+    }
+
+    protected function tearDown(): void {
+        parent::tearDown();
+        $this->cleanDB();
+    }
+
+    private function cleanDB() {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($this->table)->executeStatement();
+    }
+
+    public function testAddPasswordColumn(): void {
+        $this->config->expects($this->once())
+            ->method('getAppValue')
+            ->with('files_sharing', 'installed_version', '0.0.0')
+            ->willReturn('1.3.0');
+
+        $shareTypes = [IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_REMOTE, IShare::TYPE_EMAIL, IShare::TYPE_LINK];
+
+        foreach ($shareTypes as $shareType) {
+            for ($i = 0; $i < 5; $i++) {
+                $query = $this->connection->getQueryBuilder();
+                $query->insert($this->table)
+                    ->values([
+                        'share_type' => $query->createNamedParameter($shareType),
+                        'share_with' => $query->createNamedParameter('shareWith'),
+                        'uid_owner' => $query->createNamedParameter('user' . $i),
+                        'uid_initiator' => $query->createNamedParameter(null),
+                        'parent' => $query->createNamedParameter(0),
+                        'item_type' => $query->createNamedParameter('file'),
+                        'item_source' => $query->createNamedParameter('2'),
+                        'item_target' => $query->createNamedParameter('/2'),
+                        'file_source' => $query->createNamedParameter(2),
+                        'file_target' => $query->createNamedParameter('/foobar'),
+                        'permissions' => $query->createNamedParameter(31),
+                        'stime' => $query->createNamedParameter(time()),
+                    ]);
+
+                $this->assertSame(1, $query->executeStatement());
+            }
+        }
+
+        /** @var IOutput $output */
+        $output = $this->createMock(IOutput::class);
+        $this->migration->run($output);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('share');
+        $result = $query->executeQuery();
+        $allShares = $result->fetchAllAssociative();
+        $result->closeCursor();
+
+        foreach ($allShares as $share) {
+            if ((int)$share['share_type'] === IShare::TYPE_LINK) {
+                $this->assertNull($share['share_with']);
+                $this->assertSame('shareWith', $share['password']);
+            } else {
+                $this->assertSame('shareWith', $share['share_with']);
+                $this->assertNull($share['password']);
+            }
+        }
+    }
 }

apps/files_sharing/lib/SharesReminderJob.php

Indentation +254 added lines, -254 removed lines

@@ -33,275 +33,275 @@
  * Send a reminder via email to the sharee(s) if the folder is still empty a predefined time before the expiration date
  */
 class SharesReminderJob extends TimedJob {
-	private const SECONDS_BEFORE_REMINDER = 24 * 60 * 60;
-	private const CHUNK_SIZE = 1000;
-	private int $folderMimeTypeId;
+    private const SECONDS_BEFORE_REMINDER = 24 * 60 * 60;
+    private const CHUNK_SIZE = 1000;
+    private int $folderMimeTypeId;
 
-	public function __construct(
-		ITimeFactory $time,
-		private readonly IDBConnection $db,
-		private readonly IManager $shareManager,
-		private readonly IUserManager $userManager,
-		private readonly LoggerInterface $logger,
-		private readonly IURLGenerator $urlGenerator,
-		private readonly IFactory $l10nFactory,
-		private readonly IMailer $mailer,
-		private readonly Defaults $defaults,
-		IMimeTypeLoader $mimeTypeLoader,
-	) {
-		parent::__construct($time);
-		$this->setInterval(60 * 60);
-		$this->folderMimeTypeId = $mimeTypeLoader->getId(ICacheEntry::DIRECTORY_MIMETYPE);
-	}
+    public function __construct(
+        ITimeFactory $time,
+        private readonly IDBConnection $db,
+        private readonly IManager $shareManager,
+        private readonly IUserManager $userManager,
+        private readonly LoggerInterface $logger,
+        private readonly IURLGenerator $urlGenerator,
+        private readonly IFactory $l10nFactory,
+        private readonly IMailer $mailer,
+        private readonly Defaults $defaults,
+        IMimeTypeLoader $mimeTypeLoader,
+    ) {
+        parent::__construct($time);
+        $this->setInterval(60 * 60);
+        $this->folderMimeTypeId = $mimeTypeLoader->getId(ICacheEntry::DIRECTORY_MIMETYPE);
+    }
 
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 * @throws Exception if a database error occurs
-	 */
-	public function run(mixed $argument): void {
-		foreach ($this->getShares() as $share) {
-			$reminderInfo = $this->prepareReminder($share);
-			if ($reminderInfo !== null) {
-				$this->sendReminder($reminderInfo);
-			}
-		}
-	}
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     * @throws Exception if a database error occurs
+     */
+    public function run(mixed $argument): void {
+        foreach ($this->getShares() as $share) {
+            $reminderInfo = $this->prepareReminder($share);
+            if ($reminderInfo !== null) {
+                $this->sendReminder($reminderInfo);
+            }
+        }
+    }
 
-	/**
-	 * Finds all shares of empty folders, for which the user has write permissions.
-	 * The returned shares are of type user or email only, have expiration dates within the specified time frame
-	 * and have not yet received a reminder.
-	 *
-	 * @return array<IShare>|\Iterator
-	 * @throws Exception if a database error occurs
-	 */
-	private function getShares(): array|\Iterator {
-		if ($this->db->getShardDefinition('filecache')) {
-			$sharesResult = $this->getSharesDataSharded();
-		} else {
-			$sharesResult = $this->getSharesData();
-		}
-		foreach ($sharesResult as $share) {
-			if ($share['share_type'] === IShare::TYPE_EMAIL) {
-				$id = "ocMailShare:$share[id]";
-			} else {
-				$id = "ocinternal:$share[id]";
-			}
+    /**
+     * Finds all shares of empty folders, for which the user has write permissions.
+     * The returned shares are of type user or email only, have expiration dates within the specified time frame
+     * and have not yet received a reminder.
+     *
+     * @return array<IShare>|\Iterator
+     * @throws Exception if a database error occurs
+     */
+    private function getShares(): array|\Iterator {
+        if ($this->db->getShardDefinition('filecache')) {
+            $sharesResult = $this->getSharesDataSharded();
+        } else {
+            $sharesResult = $this->getSharesData();
+        }
+        foreach ($sharesResult as $share) {
+            if ($share['share_type'] === IShare::TYPE_EMAIL) {
+                $id = "ocMailShare:$share[id]";
+            } else {
+                $id = "ocinternal:$share[id]";
+            }
 
-			try {
-				yield $this->shareManager->getShareById($id);
-			} catch (ShareNotFound) {
-				$this->logger->error("Share with ID $id not found.");
-			}
-		}
-	}
+            try {
+                yield $this->shareManager->getShareById($id);
+            } catch (ShareNotFound) {
+                $this->logger->error("Share with ID $id not found.");
+            }
+        }
+    }
 
-	/**
-	 * @return list<array{id: int, share_type: int}>
-	 */
-	private function getSharesData(): array {
-		$minDate = new \DateTime();
-		$maxDate = new \DateTime();
-		$maxDate->setTimestamp($maxDate->getTimestamp() + self::SECONDS_BEFORE_REMINDER);
+    /**
+     * @return list<array{id: int, share_type: int}>
+     */
+    private function getSharesData(): array {
+        $minDate = new \DateTime();
+        $maxDate = new \DateTime();
+        $maxDate->setTimestamp($maxDate->getTimestamp() + self::SECONDS_BEFORE_REMINDER);
 
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('s.id', 's.share_type')
-			->from('share', 's')
-			->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('f.parent', 's.file_source'))
-			->where(
-				$qb->expr()->andX(
-					$qb->expr()->orX(
-						$qb->expr()->eq('s.share_type', $qb->expr()->literal(IShare::TYPE_USER)),
-						$qb->expr()->eq('s.share_type', $qb->expr()->literal(IShare::TYPE_EMAIL))
-					),
-					$qb->expr()->eq('s.item_type', $qb->expr()->literal('folder')),
-					$qb->expr()->gte('s.expiration', $qb->createNamedParameter($minDate, IQueryBuilder::PARAM_DATE)),
-					$qb->expr()->lte('s.expiration', $qb->createNamedParameter($maxDate, IQueryBuilder::PARAM_DATE)),
-					$qb->expr()->eq('s.reminder_sent', $qb->createNamedParameter(
-						false, IQueryBuilder::PARAM_BOOL
-					)),
-					$qb->expr()->eq(
-						$qb->expr()->bitwiseAnd('s.permissions', Constants::PERMISSION_CREATE),
-						$qb->createNamedParameter(Constants::PERMISSION_CREATE, IQueryBuilder::PARAM_INT)
-					),
-					$qb->expr()->isNull('f.fileid')
-				)
-			)
-			->setMaxResults(SharesReminderJob::CHUNK_SIZE);
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('s.id', 's.share_type')
+            ->from('share', 's')
+            ->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('f.parent', 's.file_source'))
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('s.share_type', $qb->expr()->literal(IShare::TYPE_USER)),
+                        $qb->expr()->eq('s.share_type', $qb->expr()->literal(IShare::TYPE_EMAIL))
+                    ),
+                    $qb->expr()->eq('s.item_type', $qb->expr()->literal('folder')),
+                    $qb->expr()->gte('s.expiration', $qb->createNamedParameter($minDate, IQueryBuilder::PARAM_DATE)),
+                    $qb->expr()->lte('s.expiration', $qb->createNamedParameter($maxDate, IQueryBuilder::PARAM_DATE)),
+                    $qb->expr()->eq('s.reminder_sent', $qb->createNamedParameter(
+                        false, IQueryBuilder::PARAM_BOOL
+                    )),
+                    $qb->expr()->eq(
+                        $qb->expr()->bitwiseAnd('s.permissions', Constants::PERMISSION_CREATE),
+                        $qb->createNamedParameter(Constants::PERMISSION_CREATE, IQueryBuilder::PARAM_INT)
+                    ),
+                    $qb->expr()->isNull('f.fileid')
+                )
+            )
+            ->setMaxResults(SharesReminderJob::CHUNK_SIZE);
 
-		$shares = $qb->executeQuery()->fetchAllAssociative();
-		return array_map(fn ($share): array => [
-			'id' => (int)$share['id'],
-			'share_type' => (int)$share['share_type'],
-		], $shares);
-	}
+        $shares = $qb->executeQuery()->fetchAllAssociative();
+        return array_map(fn ($share): array => [
+            'id' => (int)$share['id'],
+            'share_type' => (int)$share['share_type'],
+        ], $shares);
+    }
 
-	/**
-	 * Sharding compatible version of getSharesData
-	 *
-	 * @return list<array{id: int, share_type: int, file_source: int}>
-	 */
-	private function getSharesDataSharded(): array|\Iterator {
-		$minDate = new \DateTime();
-		$maxDate = new \DateTime();
-		$maxDate->setTimestamp($maxDate->getTimestamp() + self::SECONDS_BEFORE_REMINDER);
+    /**
+     * Sharding compatible version of getSharesData
+     *
+     * @return list<array{id: int, share_type: int, file_source: int}>
+     */
+    private function getSharesDataSharded(): array|\Iterator {
+        $minDate = new \DateTime();
+        $maxDate = new \DateTime();
+        $maxDate->setTimestamp($maxDate->getTimestamp() + self::SECONDS_BEFORE_REMINDER);
 
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('s.id', 's.share_type', 's.file_source')
-			->from('share', 's')
-			->where(
-				$qb->expr()->andX(
-					$qb->expr()->orX(
-						$qb->expr()->eq('s.share_type', $qb->expr()->literal(IShare::TYPE_USER)),
-						$qb->expr()->eq('s.share_type', $qb->expr()->literal(IShare::TYPE_EMAIL))
-					),
-					$qb->expr()->eq('s.item_type', $qb->expr()->literal('folder')),
-					$qb->expr()->gte('s.expiration', $qb->createNamedParameter($minDate, IQueryBuilder::PARAM_DATE)),
-					$qb->expr()->lte('s.expiration', $qb->createNamedParameter($maxDate, IQueryBuilder::PARAM_DATE)),
-					$qb->expr()->eq('s.reminder_sent', $qb->createNamedParameter(
-						false, IQueryBuilder::PARAM_BOOL
-					)),
-					$qb->expr()->eq(
-						$qb->expr()->bitwiseAnd('s.permissions', Constants::PERMISSION_CREATE),
-						$qb->createNamedParameter(Constants::PERMISSION_CREATE, IQueryBuilder::PARAM_INT)
-					),
-				)
-			);
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('s.id', 's.share_type', 's.file_source')
+            ->from('share', 's')
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('s.share_type', $qb->expr()->literal(IShare::TYPE_USER)),
+                        $qb->expr()->eq('s.share_type', $qb->expr()->literal(IShare::TYPE_EMAIL))
+                    ),
+                    $qb->expr()->eq('s.item_type', $qb->expr()->literal('folder')),
+                    $qb->expr()->gte('s.expiration', $qb->createNamedParameter($minDate, IQueryBuilder::PARAM_DATE)),
+                    $qb->expr()->lte('s.expiration', $qb->createNamedParameter($maxDate, IQueryBuilder::PARAM_DATE)),
+                    $qb->expr()->eq('s.reminder_sent', $qb->createNamedParameter(
+                        false, IQueryBuilder::PARAM_BOOL
+                    )),
+                    $qb->expr()->eq(
+                        $qb->expr()->bitwiseAnd('s.permissions', Constants::PERMISSION_CREATE),
+                        $qb->createNamedParameter(Constants::PERMISSION_CREATE, IQueryBuilder::PARAM_INT)
+                    ),
+                )
+            );
 
-		$shares = $qb->executeQuery()->fetchAllAssociative();
-		$shares = array_map(fn ($share): array => [
-			'id' => (int)$share['id'],
-			'share_type' => (int)$share['share_type'],
-			'file_source' => (int)$share['file_source'],
-		], $shares);
-		return $this->filterSharesWithEmptyFolders($shares, self::CHUNK_SIZE);
-	}
+        $shares = $qb->executeQuery()->fetchAllAssociative();
+        $shares = array_map(fn ($share): array => [
+            'id' => (int)$share['id'],
+            'share_type' => (int)$share['share_type'],
+            'file_source' => (int)$share['file_source'],
+        ], $shares);
+        return $this->filterSharesWithEmptyFolders($shares, self::CHUNK_SIZE);
+    }
 
-	/**
-	 * Check which of the supplied file ids is an empty folder until there are `$maxResults` folders
-	 * @param list<array{id: int, share_type: int, file_source: int}> $shares
-	 * @return list<array{id: int, share_type: int, file_source: int}>
-	 */
-	private function filterSharesWithEmptyFolders(array $shares, int $maxResults): array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('fileid')
-			->from('filecache')
-			->where($query->expr()->eq('size', $query->createNamedParameter(0), IQueryBuilder::PARAM_INT_ARRAY))
-			->andWhere($query->expr()->eq('mimetype', $query->createNamedParameter($this->folderMimeTypeId, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->in('fileid', $query->createParameter('fileids')));
-		$chunks = array_chunk($shares, SharesReminderJob::CHUNK_SIZE);
-		$results = [];
-		foreach ($chunks as $chunk) {
-			$chunkFileIds = array_map(fn ($share): int => $share['file_source'], $chunk);
-			$chunkByFileId = array_combine($chunkFileIds, $chunk);
-			$query->setParameter('fileids', $chunkFileIds, IQueryBuilder::PARAM_INT_ARRAY);
-			$chunkResults = $query->executeQuery()->fetchFirstColumn();
-			foreach ($chunkResults as $folderId) {
-				$results[] = $chunkByFileId[$folderId];
-			}
-			if (count($results) >= $maxResults) {
-				break;
-			}
-		}
-		return $results;
-	}
+    /**
+     * Check which of the supplied file ids is an empty folder until there are `$maxResults` folders
+     * @param list<array{id: int, share_type: int, file_source: int}> $shares
+     * @return list<array{id: int, share_type: int, file_source: int}>
+     */
+    private function filterSharesWithEmptyFolders(array $shares, int $maxResults): array {
+        $query = $this->db->getQueryBuilder();
+        $query->select('fileid')
+            ->from('filecache')
+            ->where($query->expr()->eq('size', $query->createNamedParameter(0), IQueryBuilder::PARAM_INT_ARRAY))
+            ->andWhere($query->expr()->eq('mimetype', $query->createNamedParameter($this->folderMimeTypeId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->in('fileid', $query->createParameter('fileids')));
+        $chunks = array_chunk($shares, SharesReminderJob::CHUNK_SIZE);
+        $results = [];
+        foreach ($chunks as $chunk) {
+            $chunkFileIds = array_map(fn ($share): int => $share['file_source'], $chunk);
+            $chunkByFileId = array_combine($chunkFileIds, $chunk);
+            $query->setParameter('fileids', $chunkFileIds, IQueryBuilder::PARAM_INT_ARRAY);
+            $chunkResults = $query->executeQuery()->fetchFirstColumn();
+            foreach ($chunkResults as $folderId) {
+                $results[] = $chunkByFileId[$folderId];
+            }
+            if (count($results) >= $maxResults) {
+                break;
+            }
+        }
+        return $results;
+    }
 
-	/**
-	 * Retrieves and returns all the necessary data before sending a reminder.
-	 * It also updates the reminder sent flag for the affected shares (to avoid multiple reminders).
-	 *
-	 * @param IShare $share Share that was obtained with {@link getShares}
-	 * @return array|null Info needed to send a reminder
-	 */
-	private function prepareReminder(IShare $share): ?array {
-		$sharedWith = $share->getSharedWith();
-		$reminderInfo = [];
-		if ($share->getShareType() == IShare::TYPE_USER) {
-			$user = $this->userManager->get($sharedWith);
-			if ($user === null) {
-				return null;
-			}
-			$reminderInfo['email'] = $user->getEMailAddress();
-			$reminderInfo['userLang'] = $this->l10nFactory->getUserLanguage($user);
-			$reminderInfo['folderLink'] = $this->urlGenerator->linkToRouteAbsolute('files.view.index', [
-				'dir' => $share->getTarget()
-			]);
-		} else {
-			$reminderInfo['email'] = $sharedWith;
-			$reminderInfo['folderLink'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', [
-				'token' => $share->getToken()
-			]);
-		}
-		if (empty($reminderInfo['email'])) {
-			return null;
-		}
+    /**
+     * Retrieves and returns all the necessary data before sending a reminder.
+     * It also updates the reminder sent flag for the affected shares (to avoid multiple reminders).
+     *
+     * @param IShare $share Share that was obtained with {@link getShares}
+     * @return array|null Info needed to send a reminder
+     */
+    private function prepareReminder(IShare $share): ?array {
+        $sharedWith = $share->getSharedWith();
+        $reminderInfo = [];
+        if ($share->getShareType() == IShare::TYPE_USER) {
+            $user = $this->userManager->get($sharedWith);
+            if ($user === null) {
+                return null;
+            }
+            $reminderInfo['email'] = $user->getEMailAddress();
+            $reminderInfo['userLang'] = $this->l10nFactory->getUserLanguage($user);
+            $reminderInfo['folderLink'] = $this->urlGenerator->linkToRouteAbsolute('files.view.index', [
+                'dir' => $share->getTarget()
+            ]);
+        } else {
+            $reminderInfo['email'] = $sharedWith;
+            $reminderInfo['folderLink'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', [
+                'token' => $share->getToken()
+            ]);
+        }
+        if (empty($reminderInfo['email'])) {
+            return null;
+        }
 
-		try {
-			$reminderInfo['folderName'] = $share->getNode()->getName();
-		} catch (NotFoundException) {
-			$id = $share->getFullId();
-			$this->logger->error("File by share ID $id not found.");
-		}
-		$share->setReminderSent(true);
-		$this->shareManager->updateShare($share);
-		return $reminderInfo;
-	}
+        try {
+            $reminderInfo['folderName'] = $share->getNode()->getName();
+        } catch (NotFoundException) {
+            $id = $share->getFullId();
+            $this->logger->error("File by share ID $id not found.");
+        }
+        $share->setReminderSent(true);
+        $this->shareManager->updateShare($share);
+        return $reminderInfo;
+    }
 
-	/**
-	 * This method accepts data obtained by {@link prepareReminder} and sends reminder email.
-	 *
-	 * @param array $reminderInfo
-	 * @return void
-	 */
-	private function sendReminder(array $reminderInfo): void {
-		$instanceName = $this->defaults->getName();
-		$from = [Util::getDefaultEmailAddress($instanceName) => $instanceName];
-		$l = $this->l10nFactory->get('files_sharing', $reminderInfo['userLang'] ?? null);
-		$emailTemplate = $this->generateEMailTemplate($l, [
-			'link' => $reminderInfo['folderLink'], 'name' => $reminderInfo['folderName']
-		]);
+    /**
+     * This method accepts data obtained by {@link prepareReminder} and sends reminder email.
+     *
+     * @param array $reminderInfo
+     * @return void
+     */
+    private function sendReminder(array $reminderInfo): void {
+        $instanceName = $this->defaults->getName();
+        $from = [Util::getDefaultEmailAddress($instanceName) => $instanceName];
+        $l = $this->l10nFactory->get('files_sharing', $reminderInfo['userLang'] ?? null);
+        $emailTemplate = $this->generateEMailTemplate($l, [
+            'link' => $reminderInfo['folderLink'], 'name' => $reminderInfo['folderName']
+        ]);
 
-		$message = $this->mailer->createMessage();
-		$message->setFrom($from);
-		$message->setTo([$reminderInfo['email']]);
-		$message->useTemplate($emailTemplate);
-		$errorText = "Sending email with share reminder to $reminderInfo[email] failed.";
-		try {
-			$failedRecipients = $this->mailer->send($message);
-			if (count($failedRecipients) > 0) {
-				$this->logger->error($errorText);
-			}
-		} catch (\Exception) {
-			$this->logger->error($errorText);
-		}
-	}
+        $message = $this->mailer->createMessage();
+        $message->setFrom($from);
+        $message->setTo([$reminderInfo['email']]);
+        $message->useTemplate($emailTemplate);
+        $errorText = "Sending email with share reminder to $reminderInfo[email] failed.";
+        try {
+            $failedRecipients = $this->mailer->send($message);
+            if (count($failedRecipients) > 0) {
+                $this->logger->error($errorText);
+            }
+        } catch (\Exception) {
+            $this->logger->error($errorText);
+        }
+    }
 
-	/**
-	 * Returns the reminder email template
-	 *
-	 * @param IL10N $l
-	 * @param array $folder Folder the user should be reminded of
-	 * @return IEMailTemplate
-	 */
-	private function generateEMailTemplate(IL10N $l, array $folder): IEMailTemplate {
-		$emailTemplate = $this->mailer->createEMailTemplate('files_sharing.SharesReminder', [
-			'folder' => $folder,
-		]);
-		$emailTemplate->addHeader();
-		$emailTemplate->setSubject(
-			$l->t('Remember to upload the files to %s', [$folder['name']])
-		);
-		$emailTemplate->addBodyText($l->t(
-			'We would like to kindly remind you that you have not yet uploaded any files to the shared folder.'
-		));
-		$emailTemplate->addBodyButton(
-			$l->t('Open "%s"', [$folder['name']]),
-			$folder['link']
-		);
-		$emailTemplate->addFooter();
-		return $emailTemplate;
-	}
+    /**
+     * Returns the reminder email template
+     *
+     * @param IL10N $l
+     * @param array $folder Folder the user should be reminded of
+     * @return IEMailTemplate
+     */
+    private function generateEMailTemplate(IL10N $l, array $folder): IEMailTemplate {
+        $emailTemplate = $this->mailer->createEMailTemplate('files_sharing.SharesReminder', [
+            'folder' => $folder,
+        ]);
+        $emailTemplate->addHeader();
+        $emailTemplate->setSubject(
+            $l->t('Remember to upload the files to %s', [$folder['name']])
+        );
+        $emailTemplate->addBodyText($l->t(
+            'We would like to kindly remind you that you have not yet uploaded any files to the shared folder.'
+        ));
+        $emailTemplate->addBodyButton(
+            $l->t('Open "%s"', [$folder['name']]),
+            $folder['link']
+        );
+        $emailTemplate->addFooter();
+        return $emailTemplate;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -78,7 +78,7 @@ 
 	 * @return array<IShare>|\Iterator
 	 * @throws Exception if a database error occurs
 	 */
-	private function getShares(): array|\Iterator {
+	private function getShares(): array | \Iterator {
 		if ($this->db->getShardDefinition('filecache')) {
 			$sharesResult = $this->getSharesDataSharded();
 		} else {
@@ -134,8 +134,8 @@ 
 
 		$shares = $qb->executeQuery()->fetchAllAssociative();
 		return array_map(fn ($share): array => [
-			'id' => (int)$share['id'],
-			'share_type' => (int)$share['share_type'],
+			'id' => (int) $share['id'],
+			'share_type' => (int) $share['share_type'],
 		], $shares);
 	}
 
@@ -144,7 +144,7 @@ 
 	 *
 	 * @return list<array{id: int, share_type: int, file_source: int}>
 	 */
-	private function getSharesDataSharded(): array|\Iterator {
+	private function getSharesDataSharded(): array | \Iterator {
 		$minDate = new \DateTime();
 		$maxDate = new \DateTime();
 		$maxDate->setTimestamp($maxDate->getTimestamp() + self::SECONDS_BEFORE_REMINDER);
@@ -173,9 +173,9 @@ 
 
 		$shares = $qb->executeQuery()->fetchAllAssociative();
 		$shares = array_map(fn ($share): array => [
-			'id' => (int)$share['id'],
-			'share_type' => (int)$share['share_type'],
-			'file_source' => (int)$share['file_source'],
+			'id' => (int) $share['id'],
+			'share_type' => (int) $share['share_type'],
+			'file_source' => (int) $share['file_source'],
 		], $shares);
 		return $this->filterSharesWithEmptyFolders($shares, self::CHUNK_SIZE);
 	}

apps/files_sharing/lib/OrphanHelper.php

Indentation +76 added lines, -76 removed lines

@@ -15,88 +15,88 @@
 use OCP\IDBConnection;
 
 class OrphanHelper {
-	public function __construct(
-		private IDBConnection $connection,
-		private IRootFolder $rootFolder,
-		private IUserMountCache $userMountCache,
-	) {
-	}
+    public function __construct(
+        private IDBConnection $connection,
+        private IRootFolder $rootFolder,
+        private IUserMountCache $userMountCache,
+    ) {
+    }
 
-	public function isShareValid(string $owner, int $fileId): bool {
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($owner);
-		} catch (NoUserException $e) {
-			return false;
-		}
-		$node = $userFolder->getFirstNodeById($fileId);
-		return $node !== null;
-	}
+    public function isShareValid(string $owner, int $fileId): bool {
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($owner);
+        } catch (NoUserException $e) {
+            return false;
+        }
+        $node = $userFolder->getFirstNodeById($fileId);
+        return $node !== null;
+    }
 
-	/**
-	 * @param int[] $ids
-	 * @return void
-	 */
-	public function deleteShares(array $ids): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete('share')
-			->where($query->expr()->in('id', $query->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
-		$query->executeStatement();
-	}
+    /**
+     * @param int[] $ids
+     * @return void
+     */
+    public function deleteShares(array $ids): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete('share')
+            ->where($query->expr()->in('id', $query->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
+        $query->executeStatement();
+    }
 
-	public function fileExists(int $fileId): bool {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('fileid')
-			->from('filecache')
-			->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
-		return $query->executeQuery()->fetchOne() !== false;
-	}
+    public function fileExists(int $fileId): bool {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('fileid')
+            ->from('filecache')
+            ->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
+        return $query->executeQuery()->fetchOne() !== false;
+    }
 
-	/**
-	 * @return \Traversable<int, array{id: int, owner: string, fileid: int, target: string}>
-	 */
-	public function getAllShares(?string $owner = null, ?string $with = null) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('id', 'file_source', 'uid_owner', 'file_target')
-			->from('share')
-			->where($query->expr()->in('item_type', $query->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
+    /**
+     * @return \Traversable<int, array{id: int, owner: string, fileid: int, target: string}>
+     */
+    public function getAllShares(?string $owner = null, ?string $with = null) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('id', 'file_source', 'uid_owner', 'file_target')
+            ->from('share')
+            ->where($query->expr()->in('item_type', $query->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
 
-		if ($owner !== null) {
-			$query->andWhere($query->expr()->eq('uid_owner', $query->createNamedParameter($owner)));
-		}
-		if ($with !== null) {
-			$query->andWhere($query->expr()->eq('share_with', $query->createNamedParameter($with)));
-		}
+        if ($owner !== null) {
+            $query->andWhere($query->expr()->eq('uid_owner', $query->createNamedParameter($owner)));
+        }
+        if ($with !== null) {
+            $query->andWhere($query->expr()->eq('share_with', $query->createNamedParameter($with)));
+        }
 
-		$result = $query->executeQuery();
-		while ($row = $result->fetchAssociative()) {
-			yield [
-				'id' => (int)$row['id'],
-				'owner' => (string)$row['uid_owner'],
-				'fileid' => (int)$row['file_source'],
-				'target' => (string)$row['file_target'],
-			];
-		}
-	}
+        $result = $query->executeQuery();
+        while ($row = $result->fetchAssociative()) {
+            yield [
+                'id' => (int)$row['id'],
+                'owner' => (string)$row['uid_owner'],
+                'fileid' => (int)$row['file_source'],
+                'target' => (string)$row['file_target'],
+            ];
+        }
+    }
 
-	public function findOwner(int $fileId): ?string {
-		$mounts = $this->userMountCache->getMountsForFileId($fileId);
-		if (!$mounts) {
-			return null;
-		}
-		foreach ($mounts as $mount) {
-			$userHomeMountPoint = '/' . $mount->getUser()->getUID() . '/';
-			if ($mount->getMountPoint() === $userHomeMountPoint) {
-				return $mount->getUser()->getUID();
-			}
-		}
-		return null;
-	}
+    public function findOwner(int $fileId): ?string {
+        $mounts = $this->userMountCache->getMountsForFileId($fileId);
+        if (!$mounts) {
+            return null;
+        }
+        foreach ($mounts as $mount) {
+            $userHomeMountPoint = '/' . $mount->getUser()->getUID() . '/';
+            if ($mount->getMountPoint() === $userHomeMountPoint) {
+                return $mount->getUser()->getUID();
+            }
+        }
+        return null;
+    }
 
-	public function updateShareOwner(int $shareId, string $owner): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->update('share')
-			->set('uid_owner', $query->createNamedParameter($owner))
-			->where($query->expr()->eq('id', $query->createNamedParameter($shareId, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-	}
+    public function updateShareOwner(int $shareId, string $owner): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->update('share')
+            ->set('uid_owner', $query->createNamedParameter($owner))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($shareId, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -70,10 +70,10 @@ 
 		$result = $query->executeQuery();
 		while ($row = $result->fetchAssociative()) {
 			yield [
-				'id' => (int)$row['id'],
-				'owner' => (string)$row['uid_owner'],
-				'fileid' => (int)$row['file_source'],
-				'target' => (string)$row['file_target'],
+				'id' => (int) $row['id'],
+				'owner' => (string) $row['uid_owner'],
+				'fileid' => (int) $row['file_source'],
+				'target' => (string) $row['file_target'],
 			];
 		}
 	}
@@ -84,7 +84,7 @@ 
 			return null;
 		}
 		foreach ($mounts as $mount) {
-			$userHomeMountPoint = '/' . $mount->getUser()->getUID() . '/';
+			$userHomeMountPoint = '/'.$mount->getUser()->getUID().'/';
 			if ($mount->getMountPoint() === $userHomeMountPoint) {
 				return $mount->getUser()->getUID();
 			}

apps/files_sharing/lib/BackgroundJob/FederatedSharesDiscoverJob.php

Indentation +29 added lines, -29 removed lines

@@ -18,33 +18,33 @@
 
 class FederatedSharesDiscoverJob extends TimedJob {
 
-	public function __construct(
-		ITimeFactory $time,
-		private IDBConnection $connection,
-		private IDiscoveryService $discoveryService,
-		private IOCMDiscoveryService $ocmDiscoveryService,
-		private LoggerInterface $logger,
-	) {
-		parent::__construct($time);
-		$this->setInterval(24 * 60 * 60);
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-	}
-
-	public function run($argument) {
-		$qb = $this->connection->getQueryBuilder();
-
-		$qb->selectDistinct('remote')
-			->from('share_external');
-
-		$result = $qb->executeQuery();
-		while ($row = $result->fetchAssociative()) {
-			$this->discoveryService->discover($row['remote'], 'FEDERATED_SHARING', true);
-			try {
-				$this->ocmDiscoveryService->discover($row['remote'], true);
-			} catch (OCMProviderException $e) {
-				$this->logger->info('exception while running files_sharing/lib/BackgroundJob/FederatedSharesDiscoverJob', ['exception' => $e]);
-			}
-		}
-		$result->closeCursor();
-	}
+    public function __construct(
+        ITimeFactory $time,
+        private IDBConnection $connection,
+        private IDiscoveryService $discoveryService,
+        private IOCMDiscoveryService $ocmDiscoveryService,
+        private LoggerInterface $logger,
+    ) {
+        parent::__construct($time);
+        $this->setInterval(24 * 60 * 60);
+        $this->setTimeSensitivity(self::TIME_INSENSITIVE);
+    }
+
+    public function run($argument) {
+        $qb = $this->connection->getQueryBuilder();
+
+        $qb->selectDistinct('remote')
+            ->from('share_external');
+
+        $result = $qb->executeQuery();
+        while ($row = $result->fetchAssociative()) {
+            $this->discoveryService->discover($row['remote'], 'FEDERATED_SHARING', true);
+            try {
+                $this->ocmDiscoveryService->discover($row['remote'], true);
+            } catch (OCMProviderException $e) {
+                $this->logger->info('exception while running files_sharing/lib/BackgroundJob/FederatedSharesDiscoverJob', ['exception' => $e]);
+            }
+        }
+        $result->closeCursor();
+    }
 }

apps/files_sharing/lib/Command/CleanupRemoteStorages.php

Indentation +145 added lines, -145 removed lines

@@ -21,149 +21,149 @@
  */
 class CleanupRemoteStorages extends Command {
 
-	public function __construct(
-		protected IDBConnection $connection,
-		private ICloudIdManager $cloudIdManager,
-	) {
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('sharing:cleanup-remote-storages')
-			->setDescription('Cleanup shared storage entries that have no matching entry in the shares_external table')
-			->addOption(
-				'dry-run',
-				null,
-				InputOption::VALUE_NONE,
-				'only show which storages would be deleted'
-			);
-	}
-
-	public function execute(InputInterface $input, OutputInterface $output): int {
-		$remoteStorages = $this->getRemoteStorages();
-
-		$output->writeln(count($remoteStorages) . ' remote storage(s) need(s) to be checked');
-
-		$remoteShareIds = $this->getRemoteShareIds();
-
-		$output->writeln(count($remoteShareIds) . ' remote share(s) exist');
-
-		foreach ($remoteShareIds as $id => $remoteShareId) {
-			if (isset($remoteStorages[$remoteShareId])) {
-				if ($input->getOption('dry-run') || $output->isVerbose()) {
-					$output->writeln("<info>$remoteShareId belongs to remote share $id</info>");
-				}
-
-				unset($remoteStorages[$remoteShareId]);
-			} else {
-				$output->writeln("<comment>$remoteShareId for share $id has no matching storage, yet</comment>");
-			}
-		}
-
-		if (empty($remoteStorages)) {
-			$output->writeln('<info>no storages deleted</info>');
-		} else {
-			$dryRun = $input->getOption('dry-run');
-			foreach ($remoteStorages as $id => $numericId) {
-				if ($dryRun) {
-					$output->writeln("<error>$id [$numericId] can be deleted</error>");
-					$this->countFiles($numericId, $output);
-				} else {
-					$this->deleteStorage($id, $numericId, $output);
-				}
-			}
-		}
-		return 0;
-	}
-
-	public function countFiles($numericId, OutputInterface $output) {
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->select($queryBuilder->func()->count('fileid'))
-			->from('filecache')
-			->where($queryBuilder->expr()->eq(
-				'storage',
-				$queryBuilder->createNamedParameter($numericId, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR)
-			);
-		$result = $queryBuilder->executeQuery();
-		$count = $result->fetchOne();
-		$result->closeCursor();
-		$output->writeln("$count files can be deleted for storage $numericId");
-	}
-
-	public function deleteStorage($id, $numericId, OutputInterface $output) {
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->delete('storages')
-			->where($queryBuilder->expr()->eq(
-				'id',
-				$queryBuilder->createNamedParameter($id, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR)
-			);
-		$output->write("deleting $id [$numericId] ... ");
-		$count = $queryBuilder->executeStatement();
-		$output->writeln("deleted $count storage");
-		$this->deleteFiles($numericId, $output);
-	}
-
-	public function deleteFiles($numericId, OutputInterface $output) {
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->delete('filecache')
-			->where($queryBuilder->expr()->eq(
-				'storage',
-				$queryBuilder->createNamedParameter($numericId, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR)
-			);
-		$output->write("deleting files for storage $numericId ... ");
-		$count = $queryBuilder->executeStatement();
-		$output->writeln("deleted $count files");
-	}
-
-	public function getRemoteStorages() {
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->select(['id', 'numeric_id'])
-			->from('storages')
-			->where($queryBuilder->expr()->like(
-				'id',
-				// match all 'shared::' + 32 characters storages
-				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::') . str_repeat('_', 32)),
-				IQueryBuilder::PARAM_STR)
-			)
-			->andWhere($queryBuilder->expr()->notLike(
-				'id',
-				// but not the ones starting with a '/', they are for normal shares
-				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::/') . '%'),
-				IQueryBuilder::PARAM_STR)
-			)
-			->orderBy('numeric_id');
-		$result = $queryBuilder->executeQuery();
-
-		$remoteStorages = [];
-
-		while ($row = $result->fetchAssociative()) {
-			$remoteStorages[$row['id']] = $row['numeric_id'];
-		}
-		$result->closeCursor();
-
-		return $remoteStorages;
-	}
-
-	public function getRemoteShareIds() {
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->select(['id', 'share_token', 'owner', 'remote'])
-			->from('share_external');
-		$result = $queryBuilder->executeQuery();
-
-		$remoteShareIds = [];
-
-		while ($row = $result->fetchAssociative()) {
-			$cloudId = $this->cloudIdManager->getCloudId($row['owner'], $row['remote']);
-			$remote = $cloudId->getRemote();
-
-			$remoteShareIds[$row['id']] = 'shared::' . md5($row['share_token'] . '@' . $remote);
-		}
-		$result->closeCursor();
-
-		return $remoteShareIds;
-	}
+    public function __construct(
+        protected IDBConnection $connection,
+        private ICloudIdManager $cloudIdManager,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('sharing:cleanup-remote-storages')
+            ->setDescription('Cleanup shared storage entries that have no matching entry in the shares_external table')
+            ->addOption(
+                'dry-run',
+                null,
+                InputOption::VALUE_NONE,
+                'only show which storages would be deleted'
+            );
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output): int {
+        $remoteStorages = $this->getRemoteStorages();
+
+        $output->writeln(count($remoteStorages) . ' remote storage(s) need(s) to be checked');
+
+        $remoteShareIds = $this->getRemoteShareIds();
+
+        $output->writeln(count($remoteShareIds) . ' remote share(s) exist');
+
+        foreach ($remoteShareIds as $id => $remoteShareId) {
+            if (isset($remoteStorages[$remoteShareId])) {
+                if ($input->getOption('dry-run') || $output->isVerbose()) {
+                    $output->writeln("<info>$remoteShareId belongs to remote share $id</info>");
+                }
+
+                unset($remoteStorages[$remoteShareId]);
+            } else {
+                $output->writeln("<comment>$remoteShareId for share $id has no matching storage, yet</comment>");
+            }
+        }
+
+        if (empty($remoteStorages)) {
+            $output->writeln('<info>no storages deleted</info>');
+        } else {
+            $dryRun = $input->getOption('dry-run');
+            foreach ($remoteStorages as $id => $numericId) {
+                if ($dryRun) {
+                    $output->writeln("<error>$id [$numericId] can be deleted</error>");
+                    $this->countFiles($numericId, $output);
+                } else {
+                    $this->deleteStorage($id, $numericId, $output);
+                }
+            }
+        }
+        return 0;
+    }
+
+    public function countFiles($numericId, OutputInterface $output) {
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->select($queryBuilder->func()->count('fileid'))
+            ->from('filecache')
+            ->where($queryBuilder->expr()->eq(
+                'storage',
+                $queryBuilder->createNamedParameter($numericId, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR)
+            );
+        $result = $queryBuilder->executeQuery();
+        $count = $result->fetchOne();
+        $result->closeCursor();
+        $output->writeln("$count files can be deleted for storage $numericId");
+    }
+
+    public function deleteStorage($id, $numericId, OutputInterface $output) {
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->delete('storages')
+            ->where($queryBuilder->expr()->eq(
+                'id',
+                $queryBuilder->createNamedParameter($id, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR)
+            );
+        $output->write("deleting $id [$numericId] ... ");
+        $count = $queryBuilder->executeStatement();
+        $output->writeln("deleted $count storage");
+        $this->deleteFiles($numericId, $output);
+    }
+
+    public function deleteFiles($numericId, OutputInterface $output) {
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->delete('filecache')
+            ->where($queryBuilder->expr()->eq(
+                'storage',
+                $queryBuilder->createNamedParameter($numericId, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR)
+            );
+        $output->write("deleting files for storage $numericId ... ");
+        $count = $queryBuilder->executeStatement();
+        $output->writeln("deleted $count files");
+    }
+
+    public function getRemoteStorages() {
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->select(['id', 'numeric_id'])
+            ->from('storages')
+            ->where($queryBuilder->expr()->like(
+                'id',
+                // match all 'shared::' + 32 characters storages
+                $queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::') . str_repeat('_', 32)),
+                IQueryBuilder::PARAM_STR)
+            )
+            ->andWhere($queryBuilder->expr()->notLike(
+                'id',
+                // but not the ones starting with a '/', they are for normal shares
+                $queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::/') . '%'),
+                IQueryBuilder::PARAM_STR)
+            )
+            ->orderBy('numeric_id');
+        $result = $queryBuilder->executeQuery();
+
+        $remoteStorages = [];
+
+        while ($row = $result->fetchAssociative()) {
+            $remoteStorages[$row['id']] = $row['numeric_id'];
+        }
+        $result->closeCursor();
+
+        return $remoteStorages;
+    }
+
+    public function getRemoteShareIds() {
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->select(['id', 'share_token', 'owner', 'remote'])
+            ->from('share_external');
+        $result = $queryBuilder->executeQuery();
+
+        $remoteShareIds = [];
+
+        while ($row = $result->fetchAssociative()) {
+            $cloudId = $this->cloudIdManager->getCloudId($row['owner'], $row['remote']);
+            $remote = $cloudId->getRemote();
+
+            $remoteShareIds[$row['id']] = 'shared::' . md5($row['share_token'] . '@' . $remote);
+        }
+        $result->closeCursor();
+
+        return $remoteShareIds;
+    }
 }

apps/files_sharing/lib/SharedMount.php

Indentation +239 added lines, -239 removed lines

@@ -28,243 +28,243 @@
  * Shared mount points can be moved by the user
  */
 class SharedMount extends MountPoint implements MoveableMount, ISharedMountPoint {
-	/**
-	 * @var SharedStorage $storage
-	 */
-	protected $storage = null;
-
-	/** @var IShare */
-	private $superShare;
-
-	/** @var IShare[] */
-	private $groupedShares;
-
-	public function __construct(
-		$storage,
-		array $mountpoints,
-		$arguments,
-		IStorageFactory $loader,
-		private View $recipientView,
-		CappedMemoryCache $folderExistCache,
-		private IEventDispatcher $eventDispatcher,
-		private IUser $user,
-		bool $alreadyVerified,
-	) {
-		$this->superShare = $arguments['superShare'];
-		$this->groupedShares = $arguments['groupedShares'];
-
-		$absMountPoint = '/' . $user->getUID() . '/files/' . trim($this->superShare->getTarget(), '/') . '/';
-
-		// after the mountpoint is verified for the first time, only new mountpoints (e.g. groupfolders can overwrite the target)
-		if (!$alreadyVerified || isset($mountpoints[$absMountPoint])) {
-			$newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints, $folderExistCache);
-			$absMountPoint = '/' . $user->getUID() . '/files/' . trim($newMountPoint, '/') . '/';
-		}
-
-		parent::__construct($storage, $absMountPoint, $arguments, $loader, null, null, MountProvider::class);
-	}
-
-	/**
-	 * check if the parent folder exists otherwise move the mount point up
-	 *
-	 * @param IShare $share
-	 * @param SharedMount[] $mountpoints
-	 * @param CappedMemoryCache<bool> $folderExistCache
-	 * @return string
-	 */
-	private function verifyMountPoint(
-		IShare $share,
-		array $mountpoints,
-		CappedMemoryCache $folderExistCache,
-	) {
-		$mountPoint = basename($share->getTarget());
-		$parent = dirname($share->getTarget());
-
-		$event = new VerifyMountPointEvent($share, $this->recipientView, $parent);
-		$this->eventDispatcher->dispatchTyped($event);
-		$parent = $event->getParent();
-
-		$cached = $folderExistCache->get($parent);
-		if ($cached) {
-			$parentExists = $cached;
-		} else {
-			$parentExists = $this->recipientView->is_dir($parent);
-			$folderExistCache->set($parent, $parentExists);
-		}
-		if (!$parentExists) {
-			$parent = Helper::getShareFolder($this->recipientView, $this->user->getUID());
-		}
-
-		$newMountPoint = $this->generateUniqueTarget(
-			Filesystem::normalizePath($parent . '/' . $mountPoint),
-			$this->recipientView,
-			$mountpoints
-		);
-
-		if ($newMountPoint !== $share->getTarget()) {
-			$this->updateFileTarget($newMountPoint, $share);
-		}
-
-		return $newMountPoint;
-	}
-
-	/**
-	 * update fileTarget in the database if the mount point changed
-	 *
-	 * @param string $newPath
-	 * @param IShare $share
-	 * @return bool
-	 */
-	private function updateFileTarget($newPath, &$share) {
-		$share->setTarget($newPath);
-
-		foreach ($this->groupedShares as $tmpShare) {
-			$tmpShare->setTarget($newPath);
-			Server::get(\OCP\Share\IManager::class)->moveShare($tmpShare, $this->user->getUID());
-		}
-
-		$this->eventDispatcher->dispatchTyped(new InvalidateMountCacheEvent($this->user));
-	}
-
-
-	/**
-	 * @param string $path
-	 * @param View $view
-	 * @param SharedMount[] $mountpoints
-	 * @return mixed
-	 */
-	private function generateUniqueTarget($path, $view, array $mountpoints) {
-		$pathinfo = pathinfo($path);
-		$ext = isset($pathinfo['extension']) ? '.' . $pathinfo['extension'] : '';
-		$name = $pathinfo['filename'];
-		$dir = $pathinfo['dirname'];
-
-		$i = 2;
-		$absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
-		while ($view->file_exists($path) || isset($mountpoints[$absolutePath])) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
-			$absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
-			$i++;
-		}
-
-		return $path;
-	}
-
-	/**
-	 * Format a path to be relative to the /user/files/ directory
-	 *
-	 * @param string $path the absolute path
-	 * @return string e.g. turns '/admin/files/test.txt' into '/test.txt'
-	 * @throws BrokenPath
-	 */
-	protected function stripUserFilesPath($path) {
-		$trimmed = ltrim($path, '/');
-		$split = explode('/', $trimmed);
-
-		// it is not a file relative to data/user/files
-		if (count($split) < 3 || $split[1] !== 'files') {
-			Server::get(LoggerInterface::class)->error('Can not strip userid and "files/" from path: ' . $path, ['app' => 'files_sharing']);
-			throw new BrokenPath('Path does not start with /user/files', 10);
-		}
-
-		// skip 'user' and 'files'
-		$sliced = array_slice($split, 2);
-		$relPath = implode('/', $sliced);
-
-		return '/' . $relPath;
-	}
-
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 * @return bool
-	 */
-	public function moveMount($target) {
-		$relTargetPath = $this->stripUserFilesPath($target);
-		$share = $this->storage->getShare();
-
-		$result = true;
-
-		try {
-			$this->updateFileTarget($relTargetPath, $share);
-			$this->setMountPoint($target);
-			$this->storage->setMountPoint($relTargetPath);
-		} catch (\Exception $e) {
-			Server::get(LoggerInterface::class)->error(
-				'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"',
-				[
-					'app' => 'files_sharing',
-					'exception' => $e,
-				]
-			);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Remove the mount points
-	 *
-	 * @return bool
-	 */
-	public function removeMount() {
-		$mountManager = Filesystem::getMountManager();
-		/** @var SharedStorage $storage */
-		$storage = $this->getStorage();
-		$result = $storage->unshareStorage();
-		$mountManager->removeMount($this->mountPoint);
-
-		return $result;
-	}
-
-	/**
-	 * @return IShare
-	 */
-	public function getShare() {
-		return $this->superShare;
-	}
-
-	/**
-	 * @return IShare[]
-	 */
-	public function getGroupedShares(): array {
-		return $this->groupedShares;
-	}
-
-	/**
-	 * Get the file id of the root of the storage
-	 *
-	 * @return int
-	 */
-	public function getStorageRootId() {
-		return $this->getShare()->getNodeId();
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getNumericStorageId() {
-		if (!is_null($this->getShare()->getNodeCacheEntry())) {
-			return $this->getShare()->getNodeCacheEntry()->getStorageId();
-		} else {
-			$builder = Server::get(IDBConnection::class)->getQueryBuilder();
-
-			$query = $builder->select('storage')
-				->from('filecache')
-				->where($builder->expr()->eq('fileid', $builder->createNamedParameter($this->getStorageRootId())));
-
-			$result = $query->executeQuery();
-			$row = $result->fetchAssociative();
-			$result->closeCursor();
-			if ($row) {
-				return (int)$row['storage'];
-			}
-			return -1;
-		}
-	}
-
-	public function getMountType() {
-		return 'shared';
-	}
+    /**
+     * @var SharedStorage $storage
+     */
+    protected $storage = null;
+
+    /** @var IShare */
+    private $superShare;
+
+    /** @var IShare[] */
+    private $groupedShares;
+
+    public function __construct(
+        $storage,
+        array $mountpoints,
+        $arguments,
+        IStorageFactory $loader,
+        private View $recipientView,
+        CappedMemoryCache $folderExistCache,
+        private IEventDispatcher $eventDispatcher,
+        private IUser $user,
+        bool $alreadyVerified,
+    ) {
+        $this->superShare = $arguments['superShare'];
+        $this->groupedShares = $arguments['groupedShares'];
+
+        $absMountPoint = '/' . $user->getUID() . '/files/' . trim($this->superShare->getTarget(), '/') . '/';
+
+        // after the mountpoint is verified for the first time, only new mountpoints (e.g. groupfolders can overwrite the target)
+        if (!$alreadyVerified || isset($mountpoints[$absMountPoint])) {
+            $newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints, $folderExistCache);
+            $absMountPoint = '/' . $user->getUID() . '/files/' . trim($newMountPoint, '/') . '/';
+        }
+
+        parent::__construct($storage, $absMountPoint, $arguments, $loader, null, null, MountProvider::class);
+    }
+
+    /**
+     * check if the parent folder exists otherwise move the mount point up
+     *
+     * @param IShare $share
+     * @param SharedMount[] $mountpoints
+     * @param CappedMemoryCache<bool> $folderExistCache
+     * @return string
+     */
+    private function verifyMountPoint(
+        IShare $share,
+        array $mountpoints,
+        CappedMemoryCache $folderExistCache,
+    ) {
+        $mountPoint = basename($share->getTarget());
+        $parent = dirname($share->getTarget());
+
+        $event = new VerifyMountPointEvent($share, $this->recipientView, $parent);
+        $this->eventDispatcher->dispatchTyped($event);
+        $parent = $event->getParent();
+
+        $cached = $folderExistCache->get($parent);
+        if ($cached) {
+            $parentExists = $cached;
+        } else {
+            $parentExists = $this->recipientView->is_dir($parent);
+            $folderExistCache->set($parent, $parentExists);
+        }
+        if (!$parentExists) {
+            $parent = Helper::getShareFolder($this->recipientView, $this->user->getUID());
+        }
+
+        $newMountPoint = $this->generateUniqueTarget(
+            Filesystem::normalizePath($parent . '/' . $mountPoint),
+            $this->recipientView,
+            $mountpoints
+        );
+
+        if ($newMountPoint !== $share->getTarget()) {
+            $this->updateFileTarget($newMountPoint, $share);
+        }
+
+        return $newMountPoint;
+    }
+
+    /**
+     * update fileTarget in the database if the mount point changed
+     *
+     * @param string $newPath
+     * @param IShare $share
+     * @return bool
+     */
+    private function updateFileTarget($newPath, &$share) {
+        $share->setTarget($newPath);
+
+        foreach ($this->groupedShares as $tmpShare) {
+            $tmpShare->setTarget($newPath);
+            Server::get(\OCP\Share\IManager::class)->moveShare($tmpShare, $this->user->getUID());
+        }
+
+        $this->eventDispatcher->dispatchTyped(new InvalidateMountCacheEvent($this->user));
+    }
+
+
+    /**
+     * @param string $path
+     * @param View $view
+     * @param SharedMount[] $mountpoints
+     * @return mixed
+     */
+    private function generateUniqueTarget($path, $view, array $mountpoints) {
+        $pathinfo = pathinfo($path);
+        $ext = isset($pathinfo['extension']) ? '.' . $pathinfo['extension'] : '';
+        $name = $pathinfo['filename'];
+        $dir = $pathinfo['dirname'];
+
+        $i = 2;
+        $absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
+        while ($view->file_exists($path) || isset($mountpoints[$absolutePath])) {
+            $path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
+            $absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
+            $i++;
+        }
+
+        return $path;
+    }
+
+    /**
+     * Format a path to be relative to the /user/files/ directory
+     *
+     * @param string $path the absolute path
+     * @return string e.g. turns '/admin/files/test.txt' into '/test.txt'
+     * @throws BrokenPath
+     */
+    protected function stripUserFilesPath($path) {
+        $trimmed = ltrim($path, '/');
+        $split = explode('/', $trimmed);
+
+        // it is not a file relative to data/user/files
+        if (count($split) < 3 || $split[1] !== 'files') {
+            Server::get(LoggerInterface::class)->error('Can not strip userid and "files/" from path: ' . $path, ['app' => 'files_sharing']);
+            throw new BrokenPath('Path does not start with /user/files', 10);
+        }
+
+        // skip 'user' and 'files'
+        $sliced = array_slice($split, 2);
+        $relPath = implode('/', $sliced);
+
+        return '/' . $relPath;
+    }
+
+    /**
+     * Move the mount point to $target
+     *
+     * @param string $target the target mount point
+     * @return bool
+     */
+    public function moveMount($target) {
+        $relTargetPath = $this->stripUserFilesPath($target);
+        $share = $this->storage->getShare();
+
+        $result = true;
+
+        try {
+            $this->updateFileTarget($relTargetPath, $share);
+            $this->setMountPoint($target);
+            $this->storage->setMountPoint($relTargetPath);
+        } catch (\Exception $e) {
+            Server::get(LoggerInterface::class)->error(
+                'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"',
+                [
+                    'app' => 'files_sharing',
+                    'exception' => $e,
+                ]
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Remove the mount points
+     *
+     * @return bool
+     */
+    public function removeMount() {
+        $mountManager = Filesystem::getMountManager();
+        /** @var SharedStorage $storage */
+        $storage = $this->getStorage();
+        $result = $storage->unshareStorage();
+        $mountManager->removeMount($this->mountPoint);
+
+        return $result;
+    }
+
+    /**
+     * @return IShare
+     */
+    public function getShare() {
+        return $this->superShare;
+    }
+
+    /**
+     * @return IShare[]
+     */
+    public function getGroupedShares(): array {
+        return $this->groupedShares;
+    }
+
+    /**
+     * Get the file id of the root of the storage
+     *
+     * @return int
+     */
+    public function getStorageRootId() {
+        return $this->getShare()->getNodeId();
+    }
+
+    /**
+     * @return int
+     */
+    public function getNumericStorageId() {
+        if (!is_null($this->getShare()->getNodeCacheEntry())) {
+            return $this->getShare()->getNodeCacheEntry()->getStorageId();
+        } else {
+            $builder = Server::get(IDBConnection::class)->getQueryBuilder();
+
+            $query = $builder->select('storage')
+                ->from('filecache')
+                ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($this->getStorageRootId())));
+
+            $result = $query->executeQuery();
+            $row = $result->fetchAssociative();
+            $result->closeCursor();
+            if ($row) {
+                return (int)$row['storage'];
+            }
+            return -1;
+        }
+    }
+
+    public function getMountType() {
+        return 'shared';
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -53,12 +53,12 @@ 
 		$this->superShare = $arguments['superShare'];
 		$this->groupedShares = $arguments['groupedShares'];
 
-		$absMountPoint = '/' . $user->getUID() . '/files/' . trim($this->superShare->getTarget(), '/') . '/';
+		$absMountPoint = '/'.$user->getUID().'/files/'.trim($this->superShare->getTarget(), '/').'/';
 
 		// after the mountpoint is verified for the first time, only new mountpoints (e.g. groupfolders can overwrite the target)
 		if (!$alreadyVerified || isset($mountpoints[$absMountPoint])) {
 			$newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints, $folderExistCache);
-			$absMountPoint = '/' . $user->getUID() . '/files/' . trim($newMountPoint, '/') . '/';
+			$absMountPoint = '/'.$user->getUID().'/files/'.trim($newMountPoint, '/').'/';
 		}
 
 		parent::__construct($storage, $absMountPoint, $arguments, $loader, null, null, MountProvider::class);
@@ -96,7 +96,7 @@ 
 		}
 
 		$newMountPoint = $this->generateUniqueTarget(
-			Filesystem::normalizePath($parent . '/' . $mountPoint),
+			Filesystem::normalizePath($parent.'/'.$mountPoint),
 			$this->recipientView,
 			$mountpoints
 		);
@@ -135,15 +135,15 @@ 
 	 */
 	private function generateUniqueTarget($path, $view, array $mountpoints) {
 		$pathinfo = pathinfo($path);
-		$ext = isset($pathinfo['extension']) ? '.' . $pathinfo['extension'] : '';
+		$ext = isset($pathinfo['extension']) ? '.'.$pathinfo['extension'] : '';
 		$name = $pathinfo['filename'];
 		$dir = $pathinfo['dirname'];
 
 		$i = 2;
-		$absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
+		$absolutePath = $this->recipientView->getAbsolutePath($path).'/';
 		while ($view->file_exists($path) || isset($mountpoints[$absolutePath])) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
-			$absolutePath = $this->recipientView->getAbsolutePath($path) . '/';
+			$path = Filesystem::normalizePath($dir.'/'.$name.' ('.$i.')'.$ext);
+			$absolutePath = $this->recipientView->getAbsolutePath($path).'/';
 			$i++;
 		}
 
@@ -163,7 +163,7 @@ 
 
 		// it is not a file relative to data/user/files
 		if (count($split) < 3 || $split[1] !== 'files') {
-			Server::get(LoggerInterface::class)->error('Can not strip userid and "files/" from path: ' . $path, ['app' => 'files_sharing']);
+			Server::get(LoggerInterface::class)->error('Can not strip userid and "files/" from path: '.$path, ['app' => 'files_sharing']);
 			throw new BrokenPath('Path does not start with /user/files', 10);
 		}
 
@@ -171,7 +171,7 @@ 
 		$sliced = array_slice($split, 2);
 		$relPath = implode('/', $sliced);
 
-		return '/' . $relPath;
+		return '/'.$relPath;
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 			$this->storage->setMountPoint($relTargetPath);
 		} catch (\Exception $e) {
 			Server::get(LoggerInterface::class)->error(
-				'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"',
+				'Could not rename mount point for shared folder "'.$this->getMountPoint().'" to "'.$target.'"',
 				[
 					'app' => 'files_sharing',
 					'exception' => $e,
@@ -258,7 +258,7 @@ 
 			$row = $result->fetchAssociative();
 			$result->closeCursor();
 			if ($row) {
-				return (int)$row['storage'];
+				return (int) $row['storage'];
 			}
 			return -1;
 		}

apps/files_sharing/lib/DeleteOrphanedSharesJob.php

Indentation +97 added lines, -97 removed lines

@@ -21,112 +21,112 @@
  */
 class DeleteOrphanedSharesJob extends TimedJob {
 
-	use TTransactional;
+    use TTransactional;
 
-	private const CHUNK_SIZE = 1000;
+    private const CHUNK_SIZE = 1000;
 
-	private const INTERVAL = 24 * 60 * 60;
+    private const INTERVAL = 24 * 60 * 60;
 
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct(
-		ITimeFactory $time,
-		private IDBConnection $db,
-		private LoggerInterface $logger,
-	) {
-		parent::__construct($time);
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct(
+        ITimeFactory $time,
+        private IDBConnection $db,
+        private LoggerInterface $logger,
+    ) {
+        parent::__construct($time);
 
-		$this->setInterval(self::INTERVAL); // 1 day
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-	}
+        $this->setInterval(self::INTERVAL); // 1 day
+        $this->setTimeSensitivity(self::TIME_INSENSITIVE);
+    }
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		if ($this->db->getShardDefinition('filecache')) {
-			$this->shardingCleanup();
-			return;
-		}
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        if ($this->db->getShardDefinition('filecache')) {
+            $this->shardingCleanup();
+            return;
+        }
 
-		$qbSelect = $this->db->getQueryBuilder();
-		$qbSelect->select('id')
-			->from('share', 's')
-			->leftJoin('s', 'filecache', 'fc', $qbSelect->expr()->eq('s.file_source', 'fc.fileid'))
-			->where($qbSelect->expr()->isNull('fc.fileid'))
-			->setMaxResults(self::CHUNK_SIZE);
-		$deleteQb = $this->db->getQueryBuilder();
-		$deleteQb->delete('share')
-			->where(
-				$deleteQb->expr()->in('id', $deleteQb->createParameter('ids'), IQueryBuilder::PARAM_INT_ARRAY)
-			);
+        $qbSelect = $this->db->getQueryBuilder();
+        $qbSelect->select('id')
+            ->from('share', 's')
+            ->leftJoin('s', 'filecache', 'fc', $qbSelect->expr()->eq('s.file_source', 'fc.fileid'))
+            ->where($qbSelect->expr()->isNull('fc.fileid'))
+            ->setMaxResults(self::CHUNK_SIZE);
+        $deleteQb = $this->db->getQueryBuilder();
+        $deleteQb->delete('share')
+            ->where(
+                $deleteQb->expr()->in('id', $deleteQb->createParameter('ids'), IQueryBuilder::PARAM_INT_ARRAY)
+            );
 
-		/**
-		 * Read a chunk of orphan rows and delete them. Continue as long as the
-		 * chunk is filled and time before the next cron run does not run out.
-		 *
-		 * Note: With isolation level READ COMMITTED, the database will allow
-		 * other transactions to delete rows between our SELECT and DELETE. In
-		 * that (unlikely) case, our DELETE will have fewer affected rows than
-		 * IDs passed for the WHERE IN. If this happens while processing a full
-		 * chunk, the logic below will stop prematurely.
-		 * Note: The queries below are optimized for low database locking. They
-		 * could be combined into one single DELETE with join or sub query, but
-		 * that has shown to (dead)lock often.
-		 */
-		$cutOff = $this->time->getTime() + self::INTERVAL;
-		do {
-			$deleted = $this->atomic(function () use ($qbSelect, $deleteQb) {
-				$result = $qbSelect->executeQuery();
-				$ids = array_map('intval', $result->fetchFirstColumn());
-				$result->closeCursor();
-				$deleteQb->setParameter('ids', $ids, IQueryBuilder::PARAM_INT_ARRAY);
-				$deleted = $deleteQb->executeStatement();
-				$this->logger->debug('{deleted} orphaned share(s) deleted', [
-					'app' => 'DeleteOrphanedSharesJob',
-					'deleted' => $deleted,
-				]);
-				return $deleted;
-			}, $this->db);
-		} while ($deleted >= self::CHUNK_SIZE && $this->time->getTime() <= $cutOff);
-	}
+        /**
+         * Read a chunk of orphan rows and delete them. Continue as long as the
+         * chunk is filled and time before the next cron run does not run out.
+         *
+         * Note: With isolation level READ COMMITTED, the database will allow
+         * other transactions to delete rows between our SELECT and DELETE. In
+         * that (unlikely) case, our DELETE will have fewer affected rows than
+         * IDs passed for the WHERE IN. If this happens while processing a full
+         * chunk, the logic below will stop prematurely.
+         * Note: The queries below are optimized for low database locking. They
+         * could be combined into one single DELETE with join or sub query, but
+         * that has shown to (dead)lock often.
+         */
+        $cutOff = $this->time->getTime() + self::INTERVAL;
+        do {
+            $deleted = $this->atomic(function () use ($qbSelect, $deleteQb) {
+                $result = $qbSelect->executeQuery();
+                $ids = array_map('intval', $result->fetchFirstColumn());
+                $result->closeCursor();
+                $deleteQb->setParameter('ids', $ids, IQueryBuilder::PARAM_INT_ARRAY);
+                $deleted = $deleteQb->executeStatement();
+                $this->logger->debug('{deleted} orphaned share(s) deleted', [
+                    'app' => 'DeleteOrphanedSharesJob',
+                    'deleted' => $deleted,
+                ]);
+                return $deleted;
+            }, $this->db);
+        } while ($deleted >= self::CHUNK_SIZE && $this->time->getTime() <= $cutOff);
+    }
 
-	private function shardingCleanup(): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->selectDistinct('file_source')
-			->from('share', 's');
-		$sourceFiles = $qb->executeQuery()->fetchFirstColumn();
+    private function shardingCleanup(): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->selectDistinct('file_source')
+            ->from('share', 's');
+        $sourceFiles = $qb->executeQuery()->fetchFirstColumn();
 
-		$deleteQb = $this->db->getQueryBuilder();
-		$deleteQb->delete('share')
-			->where(
-				$deleteQb->expr()->in('file_source', $deleteQb->createParameter('ids'), IQueryBuilder::PARAM_INT_ARRAY)
-			);
+        $deleteQb = $this->db->getQueryBuilder();
+        $deleteQb->delete('share')
+            ->where(
+                $deleteQb->expr()->in('file_source', $deleteQb->createParameter('ids'), IQueryBuilder::PARAM_INT_ARRAY)
+            );
 
-		$chunks = array_chunk($sourceFiles, self::CHUNK_SIZE);
-		foreach ($chunks as $chunk) {
-			$deletedFiles = $this->findMissingSources($chunk);
-			$this->atomic(function () use ($deletedFiles, $deleteQb) {
-				$deleteQb->setParameter('ids', $deletedFiles, IQueryBuilder::PARAM_INT_ARRAY);
-				$deleted = $deleteQb->executeStatement();
-				$this->logger->debug('{deleted} orphaned share(s) deleted', [
-					'app' => 'DeleteOrphanedSharesJob',
-					'deleted' => $deleted,
-				]);
-				return $deleted;
-			}, $this->db);
-		}
-	}
+        $chunks = array_chunk($sourceFiles, self::CHUNK_SIZE);
+        foreach ($chunks as $chunk) {
+            $deletedFiles = $this->findMissingSources($chunk);
+            $this->atomic(function () use ($deletedFiles, $deleteQb) {
+                $deleteQb->setParameter('ids', $deletedFiles, IQueryBuilder::PARAM_INT_ARRAY);
+                $deleted = $deleteQb->executeStatement();
+                $this->logger->debug('{deleted} orphaned share(s) deleted', [
+                    'app' => 'DeleteOrphanedSharesJob',
+                    'deleted' => $deleted,
+                ]);
+                return $deleted;
+            }, $this->db);
+        }
+    }
 
-	private function findMissingSources(array $ids): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('fileid')
-			->from('filecache')
-			->where($qb->expr()->in('fileid', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
-		$found = $qb->executeQuery()->fetchFirstColumn();
-		return array_diff($ids, $found);
-	}
+    private function findMissingSources(array $ids): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('fileid')
+            ->from('filecache')
+            ->where($qb->expr()->in('fileid', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
+        $found = $qb->executeQuery()->fetchFirstColumn();
+        return array_diff($ids, $found);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 		 */
 		$cutOff = $this->time->getTime() + self::INTERVAL;
 		do {
-			$deleted = $this->atomic(function () use ($qbSelect, $deleteQb) {
+			$deleted = $this->atomic(function() use ($qbSelect, $deleteQb) {
 				$result = $qbSelect->executeQuery();
 				$ids = array_map('intval', $result->fetchFirstColumn());
 				$result->closeCursor();
@@ -109,7 +109,7 @@ 
 		$chunks = array_chunk($sourceFiles, self::CHUNK_SIZE);
 		foreach ($chunks as $chunk) {
 			$deletedFiles = $this->findMissingSources($chunk);
-			$this->atomic(function () use ($deletedFiles, $deleteQb) {
+			$this->atomic(function() use ($deletedFiles, $deleteQb) {
 				$deleteQb->setParameter('ids', $deletedFiles, IQueryBuilder::PARAM_INT_ARRAY);
 				$deleted = $deleteQb->executeStatement();
 				$this->logger->debug('{deleted} orphaned share(s) deleted', [

apps/files_sharing/lib/External/MountProvider.php

Indentation +44 added lines, -44 removed lines

@@ -17,52 +17,52 @@
 use OCP\Server;
 
 class MountProvider implements IMountProvider {
-	public const STORAGE = '\OCA\Files_Sharing\External\Storage';
+    public const STORAGE = '\OCA\Files_Sharing\External\Storage';
 
-	/**
-	 * @var callable
-	 */
-	private $managerProvider;
+    /**
+     * @var callable
+     */
+    private $managerProvider;
 
-	/**
-	 * @param IDBConnection $connection
-	 * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(
-		private IDBConnection $connection,
-		callable $managerProvider,
-		private ICloudIdManager $cloudIdManager,
-	) {
-		$this->managerProvider = $managerProvider;
-	}
+    /**
+     * @param IDBConnection $connection
+     * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(
+        private IDBConnection $connection,
+        callable $managerProvider,
+        private ICloudIdManager $cloudIdManager,
+    ) {
+        $this->managerProvider = $managerProvider;
+    }
 
-	public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
-		$managerProvider = $this->managerProvider;
-		$manager = $managerProvider();
-		$data['manager'] = $manager;
-		$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
-		$data['mountpoint'] = $mountPoint;
-		$data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
-		$data['certificateManager'] = \OC::$server->getCertificateManager();
-		$data['HttpClientService'] = Server::get(IClientService::class);
-		return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
-	}
+    public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
+        $managerProvider = $this->managerProvider;
+        $manager = $managerProvider();
+        $data['manager'] = $manager;
+        $mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
+        $data['mountpoint'] = $mountPoint;
+        $data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
+        $data['certificateManager'] = \OC::$server->getCertificateManager();
+        $data['HttpClientService'] = Server::get(IClientService::class);
+        return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
+    }
 
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('remote', 'share_token', 'password', 'mountpoint', 'owner')
-			->from('share_external')
-			->where($qb->expr()->eq('user', $qb->createNamedParameter($user->getUID())))
-			->andWhere($qb->expr()->eq('accepted', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT)));
-		$result = $qb->executeQuery();
-		$mounts = [];
-		while ($row = $result->fetchAssociative()) {
-			$row['manager'] = $this;
-			$row['token'] = $row['share_token'];
-			$mounts[] = $this->getMount($user, $row, $loader);
-		}
-		$result->closeCursor();
-		return $mounts;
-	}
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('remote', 'share_token', 'password', 'mountpoint', 'owner')
+            ->from('share_external')
+            ->where($qb->expr()->eq('user', $qb->createNamedParameter($user->getUID())))
+            ->andWhere($qb->expr()->eq('accepted', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT)));
+        $result = $qb->executeQuery();
+        $mounts = [];
+        while ($row = $result->fetchAssociative()) {
+            $row['manager'] = $this;
+            $row['token'] = $row['share_token'];
+            $mounts[] = $this->getMount($user, $row, $loader);
+        }
+        $result->closeCursor();
+        return $mounts;
+    }
 }