Skip to content

fix(SharingManager): Skip interaction checks if checks are overridden #62444

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

Open
provokateurin wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −14
Open

fix(SharingManager): Skip interaction checks if checks are overridden #62444

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 18 additions & 14 deletions lib/private/Sharing/SharingManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,12 @@ public function addShareSource(ShareAccessContext $accessContext, string $id, Sh
throw new ShareInvalidException('Invalid source: ' . $source->value . ' ' . $source->class, $this->l10n->t('The source does not exist.'));
}

$share = $this->getShare($accessContext, $id, $backend);
$sources = $share->sources;
$sources[] = $source;
$this->validateInteraction($accessContext, $owner, $sources, $share->getEnabledPermissions(), $share->recipients);
if (!$accessContext->overrideChecks) {
$share = $this->getShare($accessContext, $id, $backend);
$sources = $share->sources;
$sources[] = $source;
$this->validateInteraction($accessContext, $owner, $sources, $share->getEnabledPermissions(), $share->recipients);
}

$backend->addShareSource($id, $source);
}
Expand Down Expand Up @@ -277,10 +279,12 @@ public function addShareRecipient(ShareAccessContext $accessContext, string $id,
throw new ShareInvalidException('Invalid recipient: ' . $recipient->value . ' ' . $recipient->class . ' ' . ($recipient->instance ?? 'local'), $this->l10n->t('The recipient does not exist.'));
}

$share ??= $this->getShare($accessContext, $id, $backend);
$recipients = $share->recipients;
$recipients[] = $recipient;
$this->validateInteraction($accessContext, $owner, $share->sources, $share->getEnabledPermissions(), $recipients);
if (!$accessContext->overrideChecks) {
$share ??= $this->getShare($accessContext, $id, $backend);
$recipients = $share->recipients;
$recipients[] = $recipient;
$this->validateInteraction($accessContext, $owner, $share->sources, $share->getEnabledPermissions(), $recipients);
}

$backend->addShareRecipient($id, $currentUser, $recipient);
}
Expand Down Expand Up @@ -423,12 +427,12 @@ public function updateSharePermission(ShareAccessContext $accessContext, string
throw new RuntimeException('The permission type is not registered: ' . $permission->class);
}

$share = $this->getShare($accessContext, $id, $backend);

$permissions = $share->permissions;
$permissions[$permission->class] = $permission;

$this->validateInteraction($accessContext, $owner, $share->sources, array_filter($permissions, static fn (SharePermission $permission): bool => $permission->enabled), $share->recipients);
if (!$accessContext->overrideChecks) {
$share = $this->getShare($accessContext, $id, $backend);
$permissions = $share->permissions;
$permissions[$permission->class] = $permission;
$this->validateInteraction($accessContext, $owner, $share->sources, array_filter($permissions, static fn (SharePermission $permission): bool => $permission->enabled), $share->recipients);
}

$backend->updateSharePermission($id, $permission);

Expand Down
Loading