Skip to content

Commit

Permalink
Merge pull request #47893 from nextcloud/backport/47339/stable28
Browse files Browse the repository at this point in the history 
[stable28] fix: Display 'Leave share' instead of 'Delete'
  • Loading branch information
@skjnldsv
skjnldsv authored Sep 15, 2024
2 parents 8500f0d + 903f717 commit ca474ef
Show file tree
Hide file tree
Showing 5 changed files with 156 additions and 0 deletions.
21 changes: 21 additions & 0 deletions apps/files_sharing/lib/Controller/ShareAPIController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,27 @@ protected function formatShare(IShare $share, Node $recipientNode = null): array
if ($isOwnShare) {
$result['item_permissions'] = $node->getPermissions();
}

// If we're on the recipient side, the node permissions
// are bound to the share permissions. So we need to
// adjust the permissions to the share permissions if necessary.
if (!$isOwnShare) {
$result['item_permissions'] = $share->getPermissions();

// For some reason, single files share are forbidden to have the delete permission
// since we have custom methods to check those, let's adjust straight away.
// DAV permissions does not have that issue though.
if ($this->canDeleteShare($share) || $this->canDeleteShareFromSelf($share)) {
$result['item_permissions'] |= Constants::PERMISSION_DELETE;
}
if ($this->canEditShare($share)) {
$result['item_permissions'] |= Constants::PERMISSION_UPDATE;
}
}

// See MOUNT_ROOT_PROPERTYNAME dav property
$result['is-mount-root'] = $node->getInternalPath() === '';
$result['mount-type'] = $node->getMountPoint()->getMountType();

$result['mimetype'] = $node->getMimetype();
$result['has_preview'] = $this->previewManager->isAvailable($node);
Expand Down
2 changes: 2 additions & 0 deletions apps/files_sharing/lib/ResponseDefinitions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
* file_target: string,
* has_preview: bool,
* hide_download: 0|1,
* is-mount-root: bool,
* id: string,
* item_mtime: int,
* item_permissions?: int,
Expand All @@ -48,6 +49,7 @@
* label: string,
* mail_send: 0|1,
* mimetype: string,
* mount-type: string,
* note: string,
* parent: null,
* password?: string,
Expand Down
8 changes: 8 additions & 0 deletions apps/files_sharing/openapi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,7 @@
"file_target",
"has_preview",
"hide_download",
"is-mount-root",
"id",
"item_mtime",
"item_size",
Expand All @@ -488,6 +489,7 @@
"label",
"mail_send",
"mimetype",
"mount-type",
"note",
"parent",
"path",
Expand Down Expand Up @@ -543,6 +545,9 @@
1
]
},
"is-mount-root": {
"type": "boolean"
},
"id": {
"type": "string"
},
Expand Down Expand Up @@ -591,6 +596,9 @@
"mimetype": {
"type": "string"
},
"mount-type": {
"type": "string"
},
"note": {
"type": "string"
},
Expand Down
42 changes: 42 additions & 0 deletions apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3757,6 +3757,12 @@ public function dataFormatShare() {
$folder->method('getStorage')->willReturn($storage);
$fileWithPreview->method('getStorage')->willReturn($storage);


$mountPoint = $this->getMockBuilder(IMountPoint::class)->getMock();
$mountPoint->method('getMountType')->willReturn('');
$file->method('getMountPoint')->willReturn($mountPoint);
$folder->method('getMountPoint')->willReturn($mountPoint);

$owner = $this->getMockBuilder(IUser::class)->getMock();
$owner->method('getDisplayName')->willReturn('ownerDN');
$initiator = $this->getMockBuilder(IUser::class)->getMock();
Expand Down Expand Up @@ -3911,6 +3917,8 @@ public function dataFormatShare() {
'can_delete' => false,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, [], false
];
Expand Down Expand Up @@ -3962,6 +3970,8 @@ public function dataFormatShare() {
'can_delete' => true,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, [], false
];
Expand Down Expand Up @@ -4014,6 +4024,8 @@ public function dataFormatShare() {
'can_delete' => false,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, [], false
];
Expand Down Expand Up @@ -4063,6 +4075,8 @@ public function dataFormatShare() {
'can_delete' => false,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, [], false
];
Expand Down Expand Up @@ -4119,6 +4133,8 @@ public function dataFormatShare() {
'can_delete' => false,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, [], false
];
Expand Down Expand Up @@ -4175,6 +4191,8 @@ public function dataFormatShare() {
'can_delete' => false,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, [], false
];
Expand Down Expand Up @@ -4225,6 +4243,8 @@ public function dataFormatShare() {
'can_delete' => false,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, [], false
];
Expand Down Expand Up @@ -4275,6 +4295,8 @@ public function dataFormatShare() {
'can_delete' => false,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, [], false
];
Expand Down Expand Up @@ -4328,6 +4350,8 @@ public function dataFormatShare() {
'can_delete' => false,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, [], false
];
Expand Down Expand Up @@ -4378,6 +4402,8 @@ public function dataFormatShare() {
'can_delete' => false,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, [], false
];
Expand Down Expand Up @@ -4428,6 +4454,8 @@ public function dataFormatShare() {
'can_delete' => false,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, [], false
];
Expand Down Expand Up @@ -4495,6 +4523,8 @@ public function dataFormatShare() {
'password_expiration_time' => null,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, [], false
];
Expand Down Expand Up @@ -4548,6 +4578,8 @@ public function dataFormatShare() {
'password_expiration_time' => null,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, [], false
];
Expand Down Expand Up @@ -4599,6 +4631,8 @@ public function dataFormatShare() {
'can_delete' => true,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, [], false
];
Expand Down Expand Up @@ -4702,6 +4736,10 @@ public function dataFormatRoomShare() {
$file->method('getSize')->willReturn(123456);
$file->method('getMTime')->willReturn(1234567890);

$mountPoint = $this->getMockBuilder(IMountPoint::class)->getMock();
$mountPoint->method('getMountType')->willReturn('');
$file->method('getMountPoint')->willReturn($mountPoint);

$cache = $this->getMockBuilder('OCP\Files\Cache\ICache')->getMock();
$cache->method('getNumericStorageId')->willReturn(100);
$storage = $this->createMock(Storage::class);
Expand Down Expand Up @@ -4757,6 +4795,8 @@ public function dataFormatRoomShare() {
'can_delete' => false,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, false, []
];
Expand Down Expand Up @@ -4806,6 +4846,8 @@ public function dataFormatRoomShare() {
'can_delete' => false,
'item_size' => 123456,
'item_mtime' => 1234567890,
'is-mount-root' => false,
'mount-type' => '',
'attributes' => null,
], $share, true, [
'share_with_displayname' => 'recipientRoomName'
Expand Down
83 changes: 83 additions & 0 deletions build/integration/sharing_features/sharing-v1-part4.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,86 @@ Scenario: Creating a new share of a file you own shows the file permissions
And the HTTP status code should be "200"
And Share fields of last share match with
| item_permissions | 27 |

Scenario: Receiving a share of a file gives no create permission
Given user "user0" exists
And user "user1" exists
And As an "user0"
And parameter "shareapi_default_permissions" of app "core" is set to "31"
And file "welcome.txt" of user "user0" is shared with user "user1"
And sending "GET" to "/apps/files_sharing/api/v1/shares"
And share 0 is returned with
| path | /welcome.txt |
| permissions | 19 |
| item_permissions | 27 |
When As an "user1"
And user "user1" accepts last share
And sending "GET" to "/apps/files_sharing/api/v1/shares?shared_with_me=true"
Then the list of returned shares has 1 shares
And share 0 is returned with
| path | /welcome (2).txt |
| permissions | 19 |
| item_permissions | 27 |

Scenario: Receiving a share of a folder gives create permission
Given user "user0" exists
And user "user1" exists
And As an "user0"
And parameter "shareapi_default_permissions" of app "core" is set to "31"
And file "PARENT/CHILD" of user "user0" is shared with user "user1"
And sending "GET" to "/apps/files_sharing/api/v1/shares"
And share 0 is returned with
| path | /PARENT/CHILD |
| permissions | 31 |
| item_permissions | 31 |
When As an "user1"
And user "user1" accepts last share
And sending "GET" to "/apps/files_sharing/api/v1/shares?shared_with_me=true"
Then the list of returned shares has 1 shares
And share 0 is returned with
| path | /CHILD |
| permissions | 31 |
| item_permissions | 31 |

# User can remove itself from a share
Scenario: Receiving a share of a file without delete permission gives delete permission anyway
Given user "user0" exists
And user "user1" exists
And As an "user0"
And parameter "shareapi_default_permissions" of app "core" is set to "23"
And file "welcome.txt" of user "user0" is shared with user "user1"
And sending "GET" to "/apps/files_sharing/api/v1/shares"
And share 0 is returned with
| path | /welcome.txt |
| permissions | 19 |
| item_permissions | 27 |
When As an "user1"
And user "user1" accepts last share
And sending "GET" to "/apps/files_sharing/api/v1/shares?shared_with_me=true"
Then the list of returned shares has 1 shares
And share 0 is returned with
| path | /welcome (2).txt |
| permissions | 19 |
| item_permissions | 27 |

Scenario: Receiving a share of a file without delete permission gives delete permission anyway
Given user "user0" exists
And user "user1" exists
And As an "user0"
And group "group1" exists
And user "user1" belongs to group "group1"
And parameter "shareapi_default_permissions" of app "core" is set to "23"
And file "welcome.txt" of user "user0" is shared with group "group1"
And sending "GET" to "/apps/files_sharing/api/v1/shares"
And share 0 is returned with
| path | /welcome.txt |
| permissions | 19 |
| item_permissions | 27 |
When As an "user1"
And user "user1" accepts last share
And sending "GET" to "/apps/files_sharing/api/v1/shares?shared_with_me=true"
Then the list of returned shares has 1 shares
And share 0 is returned with
| path | /welcome (2).txt |
| permissions | 19 |
| item_permissions | 27 |

0 comments on commit ca474ef

Please sign in to comment.