Use the correct mountpoint to calculate #21489
Merged
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
rullzer
requested review from
nickvergessen,
ChristophWurst,
juliushaertl and
danxuliu
ChristophWurst
approved these changes
Jun 23, 2020
rullzer
added
3. to review
danxuliu
requested changes
Jun 23, 2020
lib/private/Share20/Manager.php
Outdated
| if (!$isFederatedShare && $share->getNode()->getOwner() && $share->getNode()->getOwner()->getUID() !== $share->getSharedBy()) { | ||
| // When it's a reshare use the parent share permissions as maximum | ||
| $userMountPointId = $mount->getStorageRootId(); | ||
| $userMountPoints = $userFolder->getById($userMountPointId); | ||
| $userMountPoint = array_shift($userMountPoints); | ||
|
|
||
| if ($userMountPoint === null) { | ||
| throw new \Exception('Could not get proper user mount for ' . $userMountPointId . '. Failing since else the next calls are called with null'); |
There was a problem hiding this comment.
This should be a GenericShareException, or it should be documented that generalCreateChecks can throw a plain Exception too.
|
Looking into the tests now |
|
Tried my best but this is so … up. |
rullzer
force-pushed
the
fix/share/use_correct_mount
branch
from
071603f
to
25c4591
Compare
If we use the owners mount point this results in null. And then the rest of the checks get called with null. Which doesn't work. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
rullzer
force-pushed
the
fix/share/use_correct_mount
branch
from
25c4591
to
118965a
Compare
|
Backports I guess @rullzer |
|
Yes |
|
/backport to stable19 |
|
/backport to stable18 |
|
/backport to stable17 |
This was referenced Jul 9, 2020
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.
If we use the owners mount point this results in null. And then the rest
of the checks get called with null. Which doesn't work.
Signed-off-by: Roeland Jago Douma roeland@famdouma.nl