Skip to content

Add share attributes + prevent download permission #32482

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
CarlSchwan merged 13 commits into from
Aug 1, 2022
Merged

Add share attributes + prevent download permission #32482

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a95c19e
Add share attributes + prevent download permission
PVince81 May 18, 2022
9493f86
Fix share controller to accept share attributes alone
PVince81 May 24, 2022
03b1791
Fix share attribute related tests + code style
PVince81 May 25, 2022
dbbc426
Attempt to fix sqlite json issue
PVince81 May 25, 2022
54a0d8f
Don't reset share attributes when not specified
PVince81 Jun 2, 2022
92e60e3
Add nc:share-attributes Webdav property
PVince81 Jun 2, 2022
a11c6e7
Add share attrs + download permission support in frontend
PVince81 Jun 2, 2022
2fb7a1f
Fix adding to empty attributes and duplicate request
juliusknorr Jun 8, 2022
2ee659e
Fix view-only code after code review comments
PVince81 Jun 13, 2022
3cfb4cb
Block download when needed on direct download endpoint
PVince81 Jun 13, 2022
bbb5043
Inherit hide download from share attributes
PVince81 Jun 13, 2022
ab1a205
Enforcing permission during resharing
CarlSchwan Jul 15, 2022
7b72381
Multiple fixes
CarlSchwan Jul 15, 2022
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
Prev Previous commit
Next Next commit
Fix share controller to accept share attributes alone 
Signed-off-by: Vincent Petry <[email protected]>
  • Loading branch information
@PVince81 @CarlSchwan
PVince81 authored and CarlSchwan committed Jul 28, 2022
commit 9493f86de34e76e37c13f87aab3123a3efbfdd84
7 changes: 5 additions & 2 deletions apps/files_sharing/lib/Controller/ShareAPIController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,8 @@ public function updateShare(
throw new OCSForbiddenException('You are not allowed to edit incoming shares');
}

$shareAttributes = $this->request->getParam('attributes', null);

if (
$permissions === null &&
$password === null &&
Expand All @@ -1085,7 +1087,8 @@ public function updateShare(
$expireDate === null &&
$note === null &&
$label === null &&
$hideDownload === null
$hideDownload === null &&
$shareAttributes === null
) {
throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
}
Expand Down Expand Up @@ -1224,7 +1227,7 @@ public function updateShare(
}
}

$share = $this->setShareAttributes($share, $this->request->getParam('attributes', null));
$share = $this->setShareAttributes($share, $shareAttributes);

try {
$share = $this->shareManager->updateShare($share);
Expand Down