diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-04-27 11:05:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 11:05:34 +0200 |
| commit | 1738e17e204c813bc3ab970e18a94b415c41af41 (patch) | |
| tree | 202f06b32ed14fe2a08ab446be9242ac15382bc3 /apps/files_sharing/lib | |
| parent | a64681a0fed38eb1652ddf3dd9aeeefb2a021f11 (diff) | |
| parent | 7a9469f282471168a48acdcbed84579bd93efa43 (diff) | |
| download | nextcloud-server-1738e17e204c813bc3ab970e18a94b415c41af41.tar.gz nextcloud-server-1738e17e204c813bc3ab970e18a94b415c41af41.zip | |
Merge pull request #19793 from nextcloud/bugfix/noid/link-to-federated-reshare
Fix resharing of federated shares that were created out of links
Diffstat (limited to 'apps/files_sharing/lib')
| -rw-r--r-- | apps/files_sharing/lib/Controller/ShareAPIController.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index 37dc76faaaf..12324daea39 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -492,15 +492,18 @@ class ShareAPIController extends OCSController { throw new OCSNotFoundException($this->l->t('Public upload is only possible for publicly shared folders')); } - $share->setPermissions( - Constants::PERMISSION_READ | + $permissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | - Constants::PERMISSION_DELETE - ); + Constants::PERMISSION_DELETE; } else { - $share->setPermissions(Constants::PERMISSION_READ); + $permissions = Constants::PERMISSION_READ; + } + // TODO: It might make sense to have a dedicated setting to allow/deny converting link shares into federated ones + if ($this->shareManager->outgoingServer2ServerSharesAllowed()) { + $permissions |= Constants::PERMISSION_SHARE; } + $share->setPermissions($permissions); // Set password if ($password !== '') { |