Skip to content

Restrict tag creation #1073

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
come-nc merged 3 commits into from
Mar 31, 2026
Merged

Restrict tag creation #1073

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f221f0
fix(files): Add user context to systemtag creation
artonge Mar 26, 2026
7bd26df
fix: Improve error handling and permissions checks in FilesMigrator
come-nc Mar 30, 2026
ffdb4ed
fix: Add workaround for older server version
come-nc Mar 30, 2026
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
48 changes: 43 additions & 5 deletions lib/Migrator/FilesMigrator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
use OCP\IUser;
use OCP\SystemTag\ISystemTagManager;
use OCP\SystemTag\ISystemTagObjectMapper;
use OCP\SystemTag\TagAlreadyExistsException;
use OCP\SystemTag\TagCreationForbiddenException;
use OCP\SystemTag\TagNotFoundException;
use OCP\UserMigration\IExportDestination;
use OCP\UserMigration\IImportSource;
Expand Down Expand Up @@ -300,8 +302,14 @@ public function import(
$taggedFiles = json_decode($importSource->getFileContents(static::PATH_TAGS), true, 512, JSON_THROW_ON_ERROR);
$tagger = $this->tagManager->load(Application::APP_ID, [], false, $uid);
foreach ($taggedFiles as $path => $tags) {
try {
$node = $userFolder->get((string)$path);
} catch (NotFoundException) {
/* File/Folder not found, skip */
continue;
}
foreach ($tags as $tag) {
if ($tagger->tagAs($userFolder->get($path)->getId(), $tag) === false) {
if ($tagger->tagAs($node->getId(), $tag) === false) {
throw new UserMigrationException("Failed to import tag $tag for path $path");
}
}
Expand All @@ -311,16 +319,40 @@ public function import(

$systemTaggedFiles = json_decode($importSource->getFileContents(static::PATH_SYSTEMTAGS), true, 512, JSON_THROW_ON_ERROR);
foreach ($systemTaggedFiles as $path => $systemTags) {
try {
$node = $userFolder->get((string)$path);
if (!$node->isUpdateable()) {
/* Node is read-only, cannot tag */
continue;
}
} catch (NotFoundException) {
/* File/Folder not found, skip */
continue;
}
$systemTagIds = [];
foreach ($systemTags as $systemTag) {
try {
$systemTagObject = $this->systemTagManager->getTag($systemTag, true, true);
} catch (TagNotFoundException $e) {
$systemTagObject = $this->systemTagManager->createTag($systemTag, true, true);
if (!$this->systemTagManager->canUserAssignTag($systemTagObject, $user)) {
/* Should not happen because we requested an assignable and visible tag, but let’s make sure */
continue;
}
} catch (TagNotFoundException) {
try {
if (!$this->systemTagManager->canUserCreateTag($user)) {
/* FIXME This should be remove when passing the user to the createTag method is supported by all supported Nextcloud versions */
throw new TagCreationForbiddenException();
}
/** @psalm-suppress TooManyArguments The extra argument is supported on >=34 and ignored below */
$systemTagObject = $this->systemTagManager->createTag($systemTag, true, true, $user);
} catch (TagCreationForbiddenException|TagAlreadyExistsException) {
/* Not allowed to create tag or a restricted tag with the same name exists, skip */
continue;
}
}
$systemTagIds[] = $systemTagObject->getId();
}
if ($this->systemTagMapper->assignTags((string)$userFolder->get($path)->getId(), 'files', $systemTagIds) === false) {
if ($this->systemTagMapper->assignTags((string)$node->getId(), 'files', $systemTagIds) === false) {
throw new UserMigrationException("Failed to import system tags for path $path");
}
}
Expand All @@ -329,6 +361,12 @@ public function import(

$comments = json_decode($importSource->getFileContents(static::PATH_COMMENTS), true, 512, JSON_THROW_ON_ERROR);
foreach ($comments as $path => $fileComments) {
try {
$node = $userFolder->get((string)$path);
} catch (NotFoundException) {
/* File/Folder not found, skip */
continue;
}
foreach ($fileComments as $fileComment) {
if (($fileComment['actorType'] === 'users') || ($fileComment['actorType'] === ICommentsManager::DELETED_USER)) {
$actorId = $fileComment['actorId'];
Expand All @@ -340,7 +378,7 @@ public function import(
$actorId = ICommentsManager::DELETED_USER;
$actorType = ICommentsManager::DELETED_USER;
}
$commentObject = $this->commentsManager->create($actorType, $actorId, 'files', (string)$userFolder->get($path)->getId());
$commentObject = $this->commentsManager->create($actorType, $actorId, 'files', (string)$node->getId());
$commentObject->setMessage($fileComment['message']);
$commentObject->setVerb($fileComment['verb']);
$commentObject->setCreationDateTime(new \DateTime($fileComment['creationDateTime']));
Expand Down
Loading