Skip to content

[stable9] fix(FileListener): Listen to user mount events #1389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcelklehr merged 3 commits into from
Sep 22, 2025
Merged

[stable9] fix(FileListener): Listen to user mount events #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2de9071
fix(FileListener): Listen to user mount events
marcelklehr Sep 18, 2025
e8fcf73
fix(FileListener): Address review comments
marcelklehr Sep 22, 2025
24aa8c4
fix(FileListener): Address review comments
marcelklehr Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions lib/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
use OCP\Files\Events\Node\NodeDeletedEvent;
use OCP\Files\Events\Node\NodeRenamedEvent;
use OCP\Files\Events\NodeRemovedFromCache;
use OCP\Share\Events\ShareAcceptedEvent;
use OCP\Share\Events\ShareCreatedEvent;
use OCP\Share\Events\ShareDeletedEvent;

Expand All @@ -39,11 +38,18 @@ public function __construct() {
$dispatcher->addServiceListener(NodeCreatedEvent::class, FileListener::class);
$dispatcher->addServiceListener(NodeRenamedEvent::class, FileListener::class);
$dispatcher->addServiceListener(BeforeNodeRenamedEvent::class, FileListener::class);
$dispatcher->addServiceListener(ShareCreatedEvent::class, FileListener::class);
$dispatcher->addServiceListener(ShareAcceptedEvent::class, FileListener::class);
$dispatcher->addServiceListener(ShareDeletedEvent::class, FileListener::class);
$dispatcher->addServiceListener(CacheEntryInsertedEvent::class, FileListener::class);
$dispatcher->addServiceListener(NodeRemovedFromCache::class, FileListener::class);
// These events were added mid-way through NC 30, 31
if (class_exists('OCP\Files\Config\Event\UserMountAddedEvent')) {
$dispatcher->addServiceListener('OCP\Files\Config\Event\UserMountAddedEvent', FileListener::class);
$dispatcher->addServiceListener('OCP\Files\Config\Event\UserMountRemovedEvent', FileListener::class);
// it is not fired as of now, Added and Removed events are fired instead in that order
// $context->addServiceListener('OCP\Files\Config\Event\UserMountUpdatedEvent', FileListener::class);
} else {
$dispatcher->addServiceListener(ShareCreatedEvent::class, FileListener::class);
$dispatcher->addServiceListener(ShareDeletedEvent::class, FileListener::class);
}
}

public function register(IRegistrationContext $context): void {
Expand Down
84 changes: 72 additions & 12 deletions lib/Hooks/FileListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
use OCP\Files\Node;
use OCP\Files\NotFoundException;
use OCP\IGroupManager;
use OCP\Share\Events\ShareAcceptedEvent;
use OCP\Share\Events\ShareCreatedEvent;
use OCP\Share\Events\ShareDeletedEvent;
use OCP\Share\IManager;
use Psr\Log\LoggerInterface;
Expand All @@ -53,6 +53,9 @@ final class FileListener implements IEventListener {
private array $sourceUserIds;
private ?Node $source = null;

/** @var array<string, bool> */
private array $addedMounts = [];

public function __construct(
private FaceDetectionMapper $faceDetectionMapper,
private LoggerInterface $logger,
Expand All @@ -71,14 +74,14 @@ public function __construct(
}

/**
* @param Node $node
* @param int $nodeId
* @return list<string>
* @throws InvalidPathException
* @throws NotFoundException
*/
private function getUsersWithFileAccess(Node $node): array {
private function getUsersWithFileAccess(int $nodeId): array {
$this->userMountCache->clear();
$mountInfos = $this->userMountCache->getMountsForFileId($node->getId());
$mountInfos = $this->userMountCache->getMountsForFileId($nodeId);
$userIds = array_map(static function (ICachedMountInfo $mountInfo) {
return $mountInfo->getUser()->getUID();
}, $mountInfos);
Expand All @@ -88,11 +91,31 @@ private function getUsersWithFileAccess(Node $node): array {

public function handle(Event $event): void {
try {
if ($event instanceof ShareAcceptedEvent) {
if ($event instanceof \OCP\Files\Config\Event\UserMountAddedEvent) {
$rootId = $event->mountPoint->getRootId();
// Asynchronous, because we potentially recurse and this event needs to be handled fast
$this->onAccessUpdate($event->mountPoint->getStorageId(), $rootId);
// Remember that this mount was added in the current process (see UserMountRemovedEvent below)
$this->addedMounts[$event->mountPoint->getUser()->getUID() . '-' . $rootId] = true;
}

if ($event instanceof \OCP\Files\Config\Event\UserMountRemovedEvent) {
// If we just added this mount, ignore the removal, as the 'removal' event is always fired after
// the 'added' event in server
$rootId = $event->mountPoint->getRootId();
$mountKey = $event->mountPoint->getUser()->getUID() . '-' . $rootId;
if (array_key_exists($mountKey, $this->addedMounts) && $this->addedMounts[$mountKey] === true) {
return;
}
// Asynchronous, because we potentially recurse and this event needs to be handled fast
$this->onAccessUpdate($event->mountPoint->getStorageId(), $rootId);
}

if ($event instanceof ShareCreatedEvent) {
$share = $event->getShare();
$ownerId = $share->getShareOwner();
$node = $share->getNode();
$userIds = $this->getUsersWithFileAccess($node);
$userIds = $this->getUsersWithFileAccess($node->getId());

if ($node->getType() === FileInfo::TYPE_FOLDER) {
$mount = $node->getMountPoint();
Expand Down Expand Up @@ -126,7 +149,7 @@ public function handle(Event $event): void {
if ($event instanceof ShareDeletedEvent) {
$share = $event->getShare();
$node = $share->getNode();
$userIds = $this->getUsersWithFileAccess($node);
$userIds = $this->getUsersWithFileAccess($node->getId());

if ($node->getType() === FileInfo::TYPE_FOLDER) {
$mount = $node->getMountPoint();
Expand Down Expand Up @@ -159,7 +182,7 @@ public function handle(Event $event): void {
} else {
$this->movingDirFromIgnoredTerritory = $this->getDirIgnores($event->getSource());
}
$this->sourceUserIds = $this->getUsersWithFileAccess($event->getSource());
$this->sourceUserIds = $this->getUsersWithFileAccess($event->getSource()->getId());
$this->source = $event->getSource();
return;
}
Expand Down Expand Up @@ -390,7 +413,7 @@ public function postInsert(Node $node, bool $recurse = true, ?array $mimeTypes =
* @throws Exception
*/
public function postRename(Node $source, Node $target): void {
$targetUserIds = $this->getUsersWithFileAccess($target);
$targetUserIds = $this->getUsersWithFileAccess($target->getId());

$usersToAdd = array_values(array_diff($targetUserIds, $this->sourceUserIds));
$existingUsers = array_diff($targetUserIds, $usersToAdd);
Expand All @@ -412,11 +435,11 @@ public function postRename(Node $source, Node $target): void {
private function copyFaceDetectionsForNode(string $ownerId, array $usersToAdd, array $targetUserIds, Node $node): void {
if ($node instanceof Folder) {
try {
foreach ($node->getDirectoryListing() as $node) {
if (!in_array($node->getMimetype(), Constants::IMAGE_FORMATS)) {
foreach ($node->getDirectoryListing() as $n) {
if (!in_array($n->getMimetype(), Constants::IMAGE_FORMATS)) {
continue;
}
$this->copyFaceDetectionsForNode($ownerId, $usersToAdd, $targetUserIds, $node);
$this->copyFaceDetectionsForNode($ownerId, $usersToAdd, $targetUserIds, $n);
}
} catch (NotFoundException|Exception|InvalidPathException $e) {
$this->logger->warning('Error in recognize file listener', ['exception' => $e]);
Expand Down Expand Up @@ -512,4 +535,41 @@ private function resetIgnoreCache(Node $node) : void {
}
$this->ignoreService->clearCacheForStorage($storageId);
}

/**
* @throws NotFoundException
* @throws InvalidPathException
* @throws Exception
*/
private function onAccessUpdate(int $storageId, int $rootId): void {
$userIds = $this->getUsersWithFileAccess($rootId);
$files = $this->storageService->getFilesInMount($storageId, $rootId, [ClusteringFaceClassifier::MODEL_NAME], 0, 0);
$userIdsToScheduleClustering = [];
foreach ($files as $fileInfo) {
$node = current($this->rootFolder->getById($fileInfo['fileid'])) ?: null;
$ownerId = $node?->getOwner()?->getUID();
if ($ownerId === null) {
continue;
}
$detectionsForFile = $this->faceDetectionMapper->findByFileId($fileInfo['fileid']);
$userHasDetectionForFile = [];
foreach ($detectionsForFile as $detection) {
$userHasDetectionForFile[$detection->getUserId()] = true;
}
foreach ($userIds as $userId) {
if ($userId === $ownerId) {
continue;
}
if ($userHasDetectionForFile[$userId] ?? false) {
continue;
}
$this->faceDetectionMapper->copyDetectionsForFileFromUserToUser($fileInfo['fileid'], $ownerId, $userId);
$userIdsToScheduleClustering[$userId] = true;
}
$this->faceDetectionMapper->removeDetectionsForFileFromUsersNotInList($fileInfo['fileid'], $userIds);
}
foreach (array_keys($userIdsToScheduleClustering) as $userId) {
$this->jobList->add(ClusterFacesJob::class, ['userId' => $userId]);
}
}
}
Loading