summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjoern Schiessle <bjoern@schiessle.org>2018-06-13 14:19:59 +0200
committerBjoern Schiessle <bjoern@schiessle.org>2018-07-11 10:11:44 +0200
commitb23032e4c569f7ba54197171cbb02ed8119b6811 (patch)
tree882cc64ab6398f33962428d79aa270055a20f6e0 /lib
parentc8631d607ef827f0eb29312faf7b2b808e1a8e7d (diff)
downloadnextcloud-server-b23032e4c569f7ba54197171cbb02ed8119b6811.tar.gz
nextcloud-server-b23032e4c569f7ba54197171cbb02ed8119b6811.zip
implement federated group shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Share/Constants.php1
-rw-r--r--lib/private/Share20/Manager.php11
-rw-r--r--lib/private/Share20/ProviderFactory.php5
-rw-r--r--lib/public/Share/IManager.php8
4 files changed, 23 insertions, 2 deletions
diff --git a/lib/private/Share/Constants.php b/lib/private/Share/Constants.php
index f351f8d7fda..4eb79734c06 100644
--- a/lib/private/Share/Constants.php
+++ b/lib/private/Share/Constants.php
@@ -37,6 +37,7 @@ class Constants {
const SHARE_TYPE_REMOTE = 6;
const SHARE_TYPE_CIRCLE = 7;
const SHARE_TYPE_GUEST = 8;
+ const SHARE_TYPE_REMOTE_GROUP = 9;
const FORMAT_NONE = -1;
const FORMAT_STATUSES = -2;
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 5116351a6bc..76b523afd10 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -226,6 +226,10 @@ class Manager implements IManager {
if ($share->getSharedWith() === null) {
throw new \InvalidArgumentException('SharedWith should not be empty');
}
+ } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
+ if ($share->getSharedWith() === null) {
+ throw new \InvalidArgumentException('SharedWith should not be empty');
+ }
} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
if ($share->getSharedWith() === null) {
throw new \InvalidArgumentException('SharedWith should not be empty');
@@ -1582,6 +1586,13 @@ class Manager implements IManager {
/**
* @inheritdoc
*/
+ public function outgoingServer2ServerGroupSharesAllowed() {
+ return $this->config->getAppValue('files_sharing', 'outgoing_server2server_group_share_enabled', 'no') === 'yes';
+ }
+
+ /**
+ * @inheritdoc
+ */
public function shareProviderExists($shareType) {
try {
$this->factory->getProviderForType($shareType);
diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php
index 7d866db24fa..80ef9412ffa 100644
--- a/lib/private/Share20/ProviderFactory.php
+++ b/lib/private/Share20/ProviderFactory.php
@@ -135,7 +135,8 @@ class ProviderFactory implements IProviderFactory {
$this->serverContainer->getConfig(),
$this->serverContainer->getUserManager(),
$this->serverContainer->getCloudIdManager(),
- $this->serverContainer->getGlobalScaleConfig()
+ $this->serverContainer->getGlobalScaleConfig(),
+ $this->serverContainer->getCloudFederationProviderManager()
);
}
@@ -250,7 +251,7 @@ class ProviderFactory implements IProviderFactory {
$shareType === \OCP\Share::SHARE_TYPE_LINK
) {
$provider = $this->defaultShareProvider();
- } else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
+ } else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE || \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
$provider = $this->federatedShareProvider();
} else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) {
$provider = $this->getShareByMailProvider();
diff --git a/lib/public/Share/IManager.php b/lib/public/Share/IManager.php
index d4fc3e14749..302be523327 100644
--- a/lib/public/Share/IManager.php
+++ b/lib/public/Share/IManager.php
@@ -370,6 +370,14 @@ interface IManager {
public function outgoingServer2ServerSharesAllowed();
/**
+ * Check if outgoing server2server shares are allowed
+ * @return bool
+ * @since 14.0.0
+ */
+ public function outgoingServer2ServerGroupSharesAllowed();
+
+
+ /**
* Check if a given share provider exists
* @param int $shareType
* @return bool