diff options
| author | Roeland Jago Douma <rullzer@owncloud.com> | 2016-02-04 11:13:06 +0100 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2016-02-08 11:30:48 +0100 |
| commit | a506f9ca3f0d49a346e9950b078a273f30fbf0c0 (patch) | |
| tree | 62c7035119cf3176156145300068dccac5f24781 /apps/files_sharing/api | |
| parent | bec1de8a385991f8ecc6837c672ea43a0e3dc8cf (diff) | |
| download | nextcloud-server-a506f9ca3f0d49a346e9950b078a273f30fbf0c0.tar.gz nextcloud-server-a506f9ca3f0d49a346e9950b078a273f30fbf0c0.zip | |
Respect not allowing outgoing shares
Diffstat (limited to 'apps/files_sharing/api')
| -rw-r--r-- | apps/files_sharing/api/share20ocs.php | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/api/share20ocs.php index 331c6d9e780..67a94aaf8aa 100644 --- a/apps/files_sharing/api/share20ocs.php +++ b/apps/files_sharing/api/share20ocs.php @@ -165,6 +165,10 @@ class Share20OCS { } if ($share === null) { + if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) { + return new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.'); + } + try { $share = $this->shareManager->getShareById('ocFederatedSharing:' . $id); } catch (ShareNotFound $e) { @@ -199,6 +203,10 @@ class Share20OCS { // Could not find the share as internal share... maybe it is a federated share if ($share === null) { + if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) { + return new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.'); + } + try { $share = $this->shareManager->getShareById('ocFederatedSharing:' . $id); } catch (ShareNotFound $e) { @@ -321,6 +329,10 @@ class Share20OCS { } } else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) { + if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) { + return new \OC_OCS_Result(null, 403, 'Sharing '.$path.' failed, because the backend does not allow shares from type '.$shareType); + } + $share->setSharedWith($shareWith); $share->setPermissions($permissions); } else { @@ -379,7 +391,9 @@ class Share20OCS { $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_USER, $node, false, -1, 0)); $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_GROUP, $node, false, -1, 0)); $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_LINK, $node, false, -1, 0)); - $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_REMOTE, $node, false, -1, 0)); + if ($this->shareManager->outgoingServer2ServerSharesAllowed()) { + $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_REMOTE, $node, false, -1, 0)); + } } $formatted = []; @@ -434,9 +448,13 @@ class Share20OCS { $userShares = $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_USER, $path, $reshares, -1, 0); $groupShares = $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_GROUP, $path, $reshares, -1, 0); $linkShares = $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_LINK, $path, $reshares, -1, 0); - $federatedShares = $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_REMOTE, $path, $reshares, -1, 0); + $shares = array_merge($userShares, $groupShares, $linkShares); + + if ($this->shareManager->outgoingServer2ServerSharesAllowed()) { + $federatedShares = $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_REMOTE, $path, $reshares, -1, 0); + $shares = array_merge($shares, $federatedShares); + } - $shares = array_merge($userShares, $groupShares, $linkShares, $federatedShares); $formatted = []; foreach ($shares as $share) { @@ -463,6 +481,10 @@ class Share20OCS { // Could not find the share as internal share... maybe it is a federated share if ($share === null) { + if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) { + return new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.'); + } + try { $share = $this->shareManager->getShareById('ocFederatedSharing:' . $id); } catch (ShareNotFound $e) { |