Skip to content

[stable24] Add share attributes + prevent download permission #33416

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
PVince81 merged 15 commits into from
Aug 4, 2022
Merged

[stable24] Add share attributes + prevent download permission #33416

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f1ab964
Add share attributes + prevent download permission
PVince81 May 18, 2022
1eca72d
Fix share controller to accept share attributes alone
PVince81 May 24, 2022
cf3d920
Fix share attribute related tests + code style
PVince81 May 25, 2022
9e59a6a
Attempt to fix sqlite json issue
PVince81 May 25, 2022
4b1649f
Don't reset share attributes when not specified
PVince81 Jun 2, 2022
0c468ed
Add nc:share-attributes Webdav property
PVince81 Jun 2, 2022
189b7b1
Add share attrs + download permission support in frontend
PVince81 Jun 2, 2022
ef6e4fc
Fix adding to empty attributes and duplicate request
juliusknorr Jun 8, 2022
cc75647
Fix view-only code after code review comments
PVince81 Jun 13, 2022
567b7cc
Block download when needed on direct download endpoint
PVince81 Jun 13, 2022
e959b57
Inherit hide download from share attributes
PVince81 Jun 13, 2022
146dda4
Enforcing permission during resharing
CarlSchwan Jul 15, 2022
aafaa39
Multiple fixes
CarlSchwan Jul 15, 2022
bdaa884
Fix label for allow download share permission
juliusknorr Aug 3, 2022
843b54e
Fix backport
CarlSchwan Aug 3, 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
Attempt to fix sqlite json issue 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
  • Loading branch information
@PVince81 @CarlSchwan
PVince81 authored and CarlSchwan committed Aug 3, 2022
commit 9e59a6a73117ca458d92dced49d797c12496e9d7
4 changes: 2 additions & 2 deletions lib/private/Share20/DefaultShareProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1545,8 +1545,8 @@ public function getAllShares(): iterable {
* @param string|null $data
* @return IShare modified share
*/
private function updateShareAttributes(IShare $share, $data) {
if ($data !== null) {
private function updateShareAttributes(IShare $share, ?string $data) {
if ($data !== null && $data !== '') {
$attributes = new ShareAttributes();
$compressedAttributes = \json_decode($data, true);
foreach ($compressedAttributes as $compressedAttribute) {
Expand Down