Merge pull request #15814 from owncloud/public-reshare-webdav

Fix webdav access for public reshare
owncloud · Apr 23, 2015 · a672e9d · a672e9d
2 parents d1ef96d + 7a3a8e4
commit a672e9d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 139 deletions.
diff --git a/apps/files_sharing/lib/readonlycache.php b/apps/files_sharing/lib/readonlycache.php
diff --git a/apps/files_sharing/lib/readonlywrapper.php b/apps/files_sharing/lib/readonlywrapper.php
@@ -23,7 +23,9 @@
 
 namespace OCA\Files_Sharing;
 
+use OC\Files\Cache\Wrapper\CachePermissionsMask;
 use OC\Files\Storage\Wrapper\Wrapper;
+use OCP\Constants;
 
 class ReadOnlyWrapper extends Wrapper {
 	public function isUpdatable($path) {
@@ -66,6 +68,7 @@ public function getCache($path = '', $storage = null) {
 		if (!$storage) {
 			$storage = $this;
 		}
-		return new ReadOnlyCache($storage);
+		$sourceCache = $this->storage->getCache($path, $storage);
+		return new CachePermissionsMask($sourceCache, Constants::PERMISSION_READ | Constants::PERMISSION_SHARE);
 	}
 }
diff --git a/apps/files_sharing/publicwebdav.php b/apps/files_sharing/publicwebdav.php
@@ -56,7 +56,8 @@
 // wait with registering these until auth is handled and the filesystem is setup
 $server->on('beforeMethod', function () use ($server, $objectTree, $authBackend) {
 	$share = $authBackend->getShare();
-	$owner = $share['uid_owner'];
+	$rootShare = \OCP\Share::resolveReShare($share);
+	$owner = $rootShare['uid_owner'];
 	$isWritable = $share['permissions'] & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
 	$fileId = $share['file_source'];
 

diff --git a/apps/files_sharing/tests/readonlycache.php b/apps/files_sharing/tests/readonlycache.php