summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/dav/lib/connector/sabre/filesplugin.php6
-rw-r--r--apps/dav/lib/connector/sabre/node.php50
-rw-r--r--apps/dav/tests/unit/connector/sabre/node.php64
-rw-r--r--build/integration/features/bootstrap/WebDav.php14
-rw-r--r--build/integration/features/sharing-v1.feature104
5 files changed, 238 insertions, 0 deletions
diff --git a/apps/dav/lib/connector/sabre/filesplugin.php b/apps/dav/lib/connector/sabre/filesplugin.php
index fb2af554c68..8b54291793a 100644
--- a/apps/dav/lib/connector/sabre/filesplugin.php
+++ b/apps/dav/lib/connector/sabre/filesplugin.php
@@ -45,6 +45,7 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin {
const FILEID_PROPERTYNAME = '{http://owncloud.org/ns}id';
const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid';
const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions';
+ const SHARE_PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}share-permissions';
const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL';
const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size';
const GETETAG_PROPERTYNAME = '{DAV:}getetag';
@@ -116,6 +117,7 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin {
$server->protectedProperties[] = self::FILEID_PROPERTYNAME;
$server->protectedProperties[] = self::INTERNAL_FILEID_PROPERTYNAME;
$server->protectedProperties[] = self::PERMISSIONS_PROPERTYNAME;
+ $server->protectedProperties[] = self::SHARE_PERMISSIONS_PROPERTYNAME;
$server->protectedProperties[] = self::SIZE_PROPERTYNAME;
$server->protectedProperties[] = self::DOWNLOADURL_PROPERTYNAME;
$server->protectedProperties[] = self::OWNER_ID_PROPERTYNAME;
@@ -245,6 +247,10 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin {
return $perms;
});
+ $propFind->handle(self::SHARE_PERMISSIONS_PROPERTYNAME, function() use ($node) {
+ return $node->getSharePermissions();
+ });
+
$propFind->handle(self::GETETAG_PROPERTYNAME, function() use ($node) {
return $node->getETag();
});
diff --git a/apps/dav/lib/connector/sabre/node.php b/apps/dav/lib/connector/sabre/node.php
index 95a5f0a8749..9867fe66cd3 100644
--- a/apps/dav/lib/connector/sabre/node.php
+++ b/apps/dav/lib/connector/sabre/node.php
@@ -30,6 +30,7 @@
namespace OCA\DAV\Connector\Sabre;
+use OC\Files\Mount\MoveableMount;
use OCA\DAV\Connector\Sabre\Exception\InvalidPath;
@@ -214,6 +215,55 @@ abstract class Node implements \Sabre\DAV\INode {
}
/**
+ * @return int
+ */
+ public function getSharePermissions() {
+ $storage = $this->info->getStorage();
+
+ $path = $this->info->getInternalPath();
+
+ if ($storage->instanceOfStorage('\OC\Files\Storage\Shared')) {
+ /** @var \OC\Files\Storage\Shared $storage */
+ $permissions = (int)$storage->getShare()['permissions'];
+ } else {
+ $permissions = $storage->getPermissions($path);
+ }
+
+ /*
+ * We can always share non moveable mount points with DELETE and UPDATE
+ * Eventually we need to do this properly
+ */
+ $mountpoint = $this->info->getMountPoint();
+ if (!($mountpoint instanceof MoveableMount)) {
+ $mountpointpath = $mountpoint->getMountPoint();
+ if (substr($mountpointpath, -1) === '/') {
+ $mountpointpath = substr($mountpointpath, 0, -1);
+ }
+
+ if ($mountpointpath === $this->info->getPath()) {
+ $permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
+ }
+ }
+
+ /*
+ * Without sharing permissions there are also no other permissions
+ */
+ if (!($permissions & \OCP\Constants::PERMISSION_SHARE) ||
+ !($permissions & \OCP\Constants::PERMISSION_READ)) {
+ return 0;
+ }
+
+ /*
+ * Files can't have create or delete permissions
+ */
+ if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
+ $permissions &= ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_DELETE);
+ }
+
+ return $permissions;
+ }
+
+ /**
* @return string
*/
public function getDavPermissions() {
diff --git a/apps/dav/tests/unit/connector/sabre/node.php b/apps/dav/tests/unit/connector/sabre/node.php
index 8c92c2f063c..cde8e746dc3 100644
--- a/apps/dav/tests/unit/connector/sabre/node.php
+++ b/apps/dav/tests/unit/connector/sabre/node.php
@@ -63,4 +63,68 @@ class Node extends \Test\TestCase {
$node = new \OCA\DAV\Connector\Sabre\File($view, $info);
$this->assertEquals($expected, $node->getDavPermissions());
}
+
+ public function sharePermissionsProvider() {
+ return [
+ [\OCP\Files\FileInfo::TYPE_FILE, 1, 0],
+ [\OCP\Files\FileInfo::TYPE_FILE, 3, 0],
+ [\OCP\Files\FileInfo::TYPE_FILE, 5, 0],
+ [\OCP\Files\FileInfo::TYPE_FILE, 7, 0],
+ [\OCP\Files\FileInfo::TYPE_FILE, 9, 0],
+ [\OCP\Files\FileInfo::TYPE_FILE, 11, 0],
+ [\OCP\Files\FileInfo::TYPE_FILE, 13, 0],
+ [\OCP\Files\FileInfo::TYPE_FILE, 15, 0],
+ [\OCP\Files\FileInfo::TYPE_FILE, 17, 17],
+ [\OCP\Files\FileInfo::TYPE_FILE, 19, 19],
+ [\OCP\Files\FileInfo::TYPE_FILE, 21, 17],
+ [\OCP\Files\FileInfo::TYPE_FILE, 23, 19],
+ [\OCP\Files\FileInfo::TYPE_FILE, 25, 17],
+ [\OCP\Files\FileInfo::TYPE_FILE, 27, 19],
+ [\OCP\Files\FileInfo::TYPE_FILE, 29, 17],
+ [\OCP\Files\FileInfo::TYPE_FILE, 30, 0],
+ [\OCP\Files\FileInfo::TYPE_FILE, 31, 19],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 1, 0],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 3, 0],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 5, 0],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 7, 0],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 9, 0],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 11, 0],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 13, 0],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 15, 0],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 17, 17],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 19, 19],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 21, 21],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 23, 23],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 25, 25],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 27, 27],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 29, 29],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 30, 0],
+ [\OCP\Files\FileInfo::TYPE_FOLDER, 31, 31],
+ ];
+ }
+
+ /**
+ * @dataProvider sharePermissionsProvider
+ */
+ public function testSharePermissions($type, $permissions, $expected) {
+ $storage = $this->getMock('\OCP\Files\Storage');
+ $storage->method('getPermissions')->willReturn($permissions);
+
+ $mountpoint = $this->getMock('\OCP\Files\Mount\IMountPoint');
+ $mountpoint->method('getMountPoint')->willReturn('myPath');
+
+ $info = $this->getMockBuilder('\OC\Files\FileInfo')
+ ->disableOriginalConstructor()
+ ->setMethods(['getStorage', 'getType', 'getMountPoint'])
+ ->getMock();
+
+ $info->method('getStorage')->willReturn($storage);
+ $info->method('getType')->willReturn($type);
+ $info->method('getMountPoint')->willReturn($mountpoint);
+
+ $view = $this->getMock('\OC\Files\View');
+
+ $node = new \OCA\DAV\Connector\Sabre\File($view, $info);
+ $this->assertEquals($expected, $node->getSharePermissions());
+ }
}
diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index b56a1b7d2f6..2ef5f252f11 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -316,6 +316,20 @@ trait WebDav {
}
/**
+ * @When User :user uploads file with content :content to :destination
+ */
+ public function userUploadsAFileWithContentTo($user, $content, $destination)
+ {
+ $file = \GuzzleHttp\Stream\Stream::factory($content);
+ try {
+ $this->response = $this->makeDavRequest($user, "PUT", $destination, [], $file);
+ } catch (\GuzzleHttp\Exception\ServerException $e) {
+ // 4xx and 5xx responses cause an exception
+ $this->response = $e->getResponse();
+ }
+ }
+
+ /**
* @When User :user deletes file :file
* @param string $user
* @param string $file
diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature
index ba535e83aab..b9d77120b9c 100644
--- a/build/integration/features/sharing-v1.feature
+++ b/build/integration/features/sharing-v1.feature
@@ -566,3 +566,107 @@ Feature: sharing
| path | welcome.txt |
| shareType | 3 |
Then share ids should match
+
+ Scenario: Correct webdav share-permissions for owned file
+ Given user "user0" exists
+ And User "user0" uploads file with content "foo" to "/tmp.txt"
+ When as "user0" gets properties of folder "/tmp.txt" with
+ |{http://owncloud.org/ns}share-permissions|
+ Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "19"
+
+ Scenario: Correct webdav share-permissions for received file with edit and reshare permissions
+ Given user "user0" exists
+ And user "user1" exists
+ And User "user0" uploads file with content "foo" to "/tmp.txt"
+ And file "tmp.txt" of user "user0" is shared with user "user1"
+ When as "user1" gets properties of folder "/tmp.txt" with
+ |{http://owncloud.org/ns}share-permissions|
+ Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "19"
+
+ Scenario: Correct webdav share-permissions for received file with edit permissions but no reshare permissions
+ Given user "user0" exists
+ And user "user1" exists
+ And User "user0" uploads file with content "foo" to "/tmp.txt"
+ And file "tmp.txt" of user "user0" is shared with user "user1"
+ And As an "user0"
+ And Updating last share with
+ | permissions | 3 |
+ When as "user1" gets properties of folder "/tmp.txt" with
+ |{http://owncloud.org/ns}share-permissions|
+ Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "0"
+
+ Scenario: Correct webdav share-permissions for received file with reshare permissions but no edit permissions
+ Given user "user0" exists
+ And user "user1" exists
+ And User "user0" uploads file with content "foo" to "/tmp.txt"
+ And file "tmp.txt" of user "user0" is shared with user "user1"
+ And As an "user0"
+ And Updating last share with
+ | permissions | 17 |
+ When as "user1" gets properties of folder "/tmp.txt" with
+ |{http://owncloud.org/ns}share-permissions|
+ Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "17"
+
+ Scenario: Correct webdav share-permissions for owned folder
+ Given user "user0" exists
+ And user "user0" created a folder "/tmp"
+ When as "user0" gets properties of folder "/" with
+ |{http://owncloud.org/ns}share-permissions|
+ Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "31"
+
+ Scenario: Correct webdav share-permissions for received folder with all permissions
+ Given user "user0" exists
+ And user "user1" exists
+ And user "user0" created a folder "/tmp"
+ And file "/tmp" of user "user0" is shared with user "user1"
+ When as "user1" gets properties of folder "/tmp" with
+ |{http://owncloud.org/ns}share-permissions|
+ Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "31"
+
+ Scenario: Correct webdav share-permissions for received folder with all permissions but edit
+ Given user "user0" exists
+ And user "user1" exists
+ And user "user0" created a folder "/tmp"
+ And file "/tmp" of user "user0" is shared with user "user1"
+ And As an "user0"
+ And Updating last share with
+ | permissions | 29 |
+ When as "user1" gets properties of folder "/tmp" with
+ |{http://owncloud.org/ns}share-permissions|
+ Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "29"
+
+ Scenario: Correct webdav share-permissions for received folder with all permissions but create
+ Given user "user0" exists
+ And user "user1" exists
+ And user "user0" created a folder "/tmp"
+ And file "/tmp" of user "user0" is shared with user "user1"
+ And As an "user0"
+ And Updating last share with
+ | permissions | 27 |
+ When as "user1" gets properties of folder "/tmp" with
+ |{http://owncloud.org/ns}share-permissions|
+ Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "27"
+
+ Scenario: Correct webdav share-permissions for received folder with all permissions but delete
+ Given user "user0" exists
+ And user "user1" exists
+ And user "user0" created a folder "/tmp"
+ And file "/tmp" of user "user0" is shared with user "user1"
+ And As an "user0"
+ And Updating last share with
+ | permissions | 23 |
+ When as "user1" gets properties of folder "/tmp" with
+ |{http://owncloud.org/ns}share-permissions|
+ Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "23"
+
+ Scenario: Correct webdav share-permissions for received folder with all permissions but share
+ Given user "user0" exists
+ And user "user1" exists
+ And user "user0" created a folder "/tmp"
+ And file "/tmp" of user "user0" is shared with user "user1"
+ And As an "user0"
+ And Updating last share with
+ | permissions | 15 |
+ When as "user1" gets properties of folder "/tmp" with
+ |{http://owncloud.org/ns}share-permissions|
+ Then the single response should contain a property "{http://owncloud.org/ns}share-permissions" with value "0"
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 08:00:53 +0000