fix share roots always being marked as writable #38179

icewind1991 · 2023-05-10T13:23:25Z

Since movable mounts are always marked as "updatable" some extra logic is needed to split "updatable" into "renamable" and "writable"

Fixes nextcloud/viewer#1606

skjnldsv · 2023-05-11T08:18:30Z

lib/public/Files/DavUtil.php

+		// since we always add update permissions for the root of movable mounts (and thus shares)
+		// we need to check the shared cache item directly to determine if it's writable
+		$storage = $info->getStorage();
+		if ($info->getInternalPath() === '' && $storage->instanceOfStorage(SharedStorage::class)) {


Weird psalm error 🤔

OCP cannot use stuff from OC or OCA

@icewind1991 Can this be put into isUpdatable instead?
Or in new methods isWritable/…?

Can't be put into isUpdatable because that is also used to check for rename permissions.

Adding a new method to the interface is wrought with compatibility pitfalls

is wrought with compatibility pitfalls

what would those be?

It means that any (possibly 3rdparty) implementation of the interface needs to be updated as well

marcelklehr · 2023-06-01T08:10:05Z

Any update in this? Would be cool if we could solve #1606 soon

come-nc · 2023-06-08T07:28:02Z

Any update in this? Would be cool if we could solve #1606 soon

Wrong ticket number I suppose?

come-nc · 2023-06-08T07:28:27Z

Any update in this? Would be cool if we could solve #1606 soon

Wrong ticket number I suppose?

Oh okay wrong repository, it’s nextcloud/viewer#1606

come-nc · 2023-06-08T07:41:38Z

lib/public/Files/DavUtil.php

+		// since we always add update permissions for the root of movable mounts (and thus shares)
+		// we need to check the shared cache item directly to determine if it's writable
+		$storage = $info->getStorage();
+		if ($info->getInternalPath() === '' && $storage->instanceOfStorage(SharedStorage::class)) {


Suggested change

if ($info->getInternalPath() === '' && $storage->instanceOfStorage(SharedStorage::class)) {

/** @psalm-suppress UndefinedClass files_sharing may be disabled but this will still work as expected */

if ($info->getInternalPath() === '' && $storage->instanceOfStorage(SharedStorage::class)) {

Add a suppress like this then, I do not see a better way. And ::class does not actually complains on non-existing classes so it should be fine. Maybe still test this with files_sharing disabled to be sure.

A clean fix would be to add a new interface for this, like IWritableAwareStorage, and change the code for:

Suggested change

if ($info->getInternalPath() === '' && $storage->instanceOfStorage(SharedStorage::class)) {

if ($storage->instanceOfStorage(IWritableAwareStorage::class)) {

$isWritable = $storage->isWritable($info);

ping @icewind1991

marcelklehr · 2023-07-03T12:43:43Z

Hello there!

What is the current status on this? Assume another review round is needed? Or is there still a disagreement that we need to resolve on how to solve this issue? Would be cool if we could cross this issue off soon 💙

Cheers

icewind1991 · 2023-07-12T14:14:36Z

Switched to checking for MoveableMount instead and exposed that interface in OCP

marcelklehr · 2023-07-13T13:30:39Z

Thanks for looking into this @icewind1991! Am I right in thinking that we can't backport this?

marcelklehr · 2023-07-26T09:24:31Z

Some CI runs are failling.

marcelklehr · 2023-07-27T11:36:29Z

Autoloaders are not updated it seems and a test broke:

1) OCA\DAV\Tests\unit\Connector\Sabre\NodeTest::testDavPermissions with data set #5 (31, 'file', true, 29, true, '', 'SRMGDNV')
--


+'SRMGDNVW'

Fenn-CS

Looks good

marcelklehr · 2023-07-28T09:20:01Z

More approvals will not help, I'm afraid. the tests and CI failures need to be fixed cc @icewind1991

GretaD · 2023-07-28T12:40:07Z

I need this to be merged as soon as possible for a customer

Signed-off-by: Robin Appelman <robin@icewind.nl>

icewind1991 · 2023-07-28T18:24:42Z

#39614 for the backport

icewind1991 added the 3. to review Waiting for reviews label May 10, 2023

icewind1991 added this to the Nextcloud 27 milestone May 10, 2023

icewind1991 requested review from marcelklehr, a team, ArtificialOwl, Fenn-CS and come-nc and removed request for a team May 10, 2023 13:23

icewind1991 mentioned this pull request May 10, 2023

Shared image file appears to have "SRGDNVW" permissions (although PROPFIND ground truth has "SRGD") nextcloud/viewer#1606

Closed

skjnldsv reviewed May 11, 2023

View reviewed changes

This was referenced May 12, 2023

27.0.0 beta 2 #38139

Merged

27.0.0 RC1 #38341

Merged

blizzz modified the milestones: Nextcloud 27, Nextcloud 28 May 23, 2023

icewind1991 force-pushed the dav-permissions-share-root-write branch from 18c9f40 to 910e79f Compare June 6, 2023 14:59

icewind1991 marked this pull request as ready for review June 6, 2023 16:45

AndyScherzinger requested a review from a team June 6, 2023 17:47

icewind1991 force-pushed the dav-permissions-share-root-write branch from 910e79f to ad7ad62 Compare June 6, 2023 18:02

come-nc reviewed Jun 8, 2023

View reviewed changes

icewind1991 force-pushed the dav-permissions-share-root-write branch from ad7ad62 to 533456d Compare June 8, 2023 12:29

marcelklehr requested review from come-nc and removed request for marcelklehr July 3, 2023 12:41

icewind1991 force-pushed the dav-permissions-share-root-write branch from 533456d to d82f21e Compare July 12, 2023 14:13

AndyScherzinger requested review from marcelklehr and skjnldsv July 12, 2023 18:01

marcelklehr approved these changes Jul 13, 2023

View reviewed changes

come-nc approved these changes Jul 17, 2023

View reviewed changes

Fenn-CS approved these changes Jul 28, 2023

View reviewed changes

ArtificialOwl approved these changes Jul 28, 2023

View reviewed changes

expose MovableMount in public interface

fda820a

Signed-off-by: Robin Appelman <robin@icewind.nl>

icewind1991 force-pushed the dav-permissions-share-root-write branch from d82f21e to 0186a94 Compare July 28, 2023 12:49

icewind1991 mentioned this pull request Jul 28, 2023

[27] fix share roots always being marked as writable #39614

Merged

icewind1991 enabled auto-merge July 28, 2023 13:18

icewind1991 disabled auto-merge July 28, 2023 13:35

fix share roots always being marked as writable

8af60b9

Signed-off-by: Robin Appelman <robin@icewind.nl>

icewind1991 force-pushed the dav-permissions-share-root-write branch from 0186a94 to 8af60b9 Compare July 28, 2023 15:35

icewind1991 merged commit 6a467ec into master Jul 28, 2023
37 checks passed

icewind1991 deleted the dav-permissions-share-root-write branch July 28, 2023 18:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix share roots always being marked as writable #38179

fix share roots always being marked as writable #38179

icewind1991 commented May 10, 2023

skjnldsv May 11, 2023

come-nc May 11, 2023

come-nc May 11, 2023

icewind1991 May 11, 2023 •

edited

marcelklehr Jun 1, 2023

icewind1991 Jun 6, 2023

marcelklehr commented Jun 1, 2023

come-nc commented Jun 8, 2023

come-nc commented Jun 8, 2023

come-nc Jun 8, 2023

marcelklehr Jun 21, 2023

marcelklehr commented Jul 3, 2023

icewind1991 commented Jul 12, 2023

marcelklehr commented Jul 13, 2023

marcelklehr commented Jul 26, 2023

marcelklehr commented Jul 27, 2023 •

edited

Fenn-CS left a comment

marcelklehr commented Jul 28, 2023

GretaD commented Jul 28, 2023

icewind1991 commented Jul 28, 2023

	if ($info->getInternalPath() === '' && $storage->instanceOfStorage(SharedStorage::class)) {
	/** @psalm-suppress UndefinedClass files_sharing may be disabled but this will still work as expected */
	if ($info->getInternalPath() === '' && $storage->instanceOfStorage(SharedStorage::class)) {

	if ($info->getInternalPath() === '' && $storage->instanceOfStorage(SharedStorage::class)) {
	if ($storage->instanceOfStorage(IWritableAwareStorage::class)) {
	$isWritable = $storage->isWritable($info);

fix share roots always being marked as writable #38179

fix share roots always being marked as writable #38179

Conversation

icewind1991 commented May 10, 2023

skjnldsv May 11, 2023

Choose a reason for hiding this comment

come-nc May 11, 2023

Choose a reason for hiding this comment

come-nc May 11, 2023

Choose a reason for hiding this comment

icewind1991 May 11, 2023 • edited

Choose a reason for hiding this comment

marcelklehr Jun 1, 2023

Choose a reason for hiding this comment

icewind1991 Jun 6, 2023

Choose a reason for hiding this comment

marcelklehr commented Jun 1, 2023

come-nc commented Jun 8, 2023

come-nc commented Jun 8, 2023

come-nc Jun 8, 2023

Choose a reason for hiding this comment

marcelklehr Jun 21, 2023

Choose a reason for hiding this comment

marcelklehr commented Jul 3, 2023

icewind1991 commented Jul 12, 2023

marcelklehr commented Jul 13, 2023

marcelklehr commented Jul 26, 2023

marcelklehr commented Jul 27, 2023 • edited

Fenn-CS left a comment

Choose a reason for hiding this comment

marcelklehr commented Jul 28, 2023

GretaD commented Jul 28, 2023

icewind1991 commented Jul 28, 2023

icewind1991 May 11, 2023 •

edited

marcelklehr commented Jul 27, 2023 •

edited