[stable24] Add share attributes + prevent download permission #33416
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![backportbot-nextcloud[bot]](https://avatars.githubusercontent.com/in/21012?s=60&v=4){kind=small}
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -99,6 +107,13 @@ | |||
| throw new OCSBadRequestException('Direct download only works for files'); | |||
| } | |||
|
|
|||
| $event = new BeforeDirectFileDownloadEvent($userFolder->getRelativePath($file->getPath())); | |||
Check notice
Code scanning / Psalm
PossiblyNullArgument
| if (count($nodes) > 0) { | ||
| $node = $nodes[0]; | ||
| $storage = $node->getStorage(); | ||
| if ($storage && $storage->instanceOfStorage(SharedStorage::class)) { |
Check notice
Code scanning / Psalm
RedundantConditionGivenDocblockType
CarlSchwan
force-pushed
the
backport/32482/stable24
branch
from
59c17bc to
acb4550
Compare
Merged
|
@CarlSchwan can you take care of the conflicts ? |
CarlSchwan
force-pushed
the
backport/32482/stable24
branch
from
acb4550 to
483b389
Compare
Makes it possible to store download permission Signed-off-by: Vincent Petry <[email protected]>
Signed-off-by: Vincent Petry <[email protected]>
Signed-off-by: Vincent Petry <[email protected]>
Signed-off-by: Vincent Petry <[email protected]>
When not specified in the OCS call, don't reset the share attributes. Signed-off-by: Vincent Petry <[email protected]>
Signed-off-by: Vincent Petry <[email protected]>
Added download permission checkbox in frontend Added share attributes parsing and setting in frontend. Signed-off-by: Vincent Petry <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Vincent Petry <[email protected]>
Signed-off-by: Vincent Petry <[email protected]>
When resharing by link, if the download permission was removed through share attributes, convert it to the hide download flag. Signed-off-by: Vincent Petry <[email protected]>
Signed-off-by: Carl Schwan <[email protected]>
- Fix tests - Use non deprecated event stuff - Add a bit of type hinting to the new stuff - More safe handling of instanceOfStorage (share might not be the first wrapper) - Fix resharing Signed-off-by: Carl Schwan <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
CarlSchwan
force-pushed
the
backport/32482/stable24
branch
from
483b389 to
13886b1
Compare
Signed-off-by: Carl Schwan <[email protected]>
CarlSchwan
force-pushed
the
backport/32482/stable24
branch
from
13886b1 to
843b54e
Compare
CarlSchwan
requested review from
a team,
PVince81 and
icewind1991
and removed request for
a team
PVince81
reviewed
Aug 3, 2022
PVince81
reviewed
Aug 3, 2022
PVince81
reviewed
Aug 3, 2022
PVince81
reviewed
Aug 3, 2022
CarlSchwan
added
3. to review
I tested a few things and that still works |
CarlSchwan
approved these changes
Aug 4, 2022
PVince81
approved these changes
Aug 4, 2022
|
@juliushaertl backport is merged, you can update/merge the office counterparts |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport of #32482