Merge pull request #63660 from nextcloud/leftybournes/fix/publicwebdav-v1

fix(dav): correctly mask public v1 links for non-home storages

Author: leftybournes

apps/dav/appinfo/v1/publicwebdav.php

@@ -7,6 +7,7 @@
  */
 use OC\Files\Filesystem;
 use OC\Files\Storage\Wrapper\DirPermissionsMask;
+use OC\Files\Storage\Wrapper\PermissionsMask;
 use OC\Files\View;
 use OCA\DAV\Connector\LegacyPublicAuth;
 use OCA\DAV\Connector\Sabre\BearerAuth;
@@ -19,6 +20,7 @@
 use OCP\BeforeSabrePubliclyLoadedEvent;
 use OCP\Constants;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Files\IHomeStorage;
 use OCP\Files\IRootFolder;
 use OCP\Files\Mount\IMountManager;
 use OCP\Files\Storage\IStorage;
@@ -112,11 +114,17 @@ function (\Sabre\DAV\Server $server) use (
 		// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
 		$previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false);
 		Filesystem::addStorageWrapper('sharePermissions', function (string $mountPoint, IStorage $storage) use ($share) {
-			return new DirPermissionsMask([
-				'storage' => $storage,
-				'mask' => $share->getPermissions() | Constants::PERMISSION_SHARE,
-				'path' => 'files'
-			]);
+			$mask = $share->getPermissions() | Constants::PERMISSION_SHARE;
+
+			if ($storage instanceof IHomeStorage) {
+				return new DirPermissionsMask([
+					'storage' => $storage,
+					'mask' => $mask,
+					'path' => 'files',
+				]);
+			} else {
+				return new PermissionsMask(['storage' => $storage, 'mask' => $mask]);
+			}
 		});
 		Filesystem::addStorageWrapper('shareOwner', function (string $mountPoint, IStorage $storage) use ($share) {
 			return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);