diff options
author | Kate <26026535+provokateurin@users.noreply.github.com> | 2025-05-19 10:20:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-05-19 10:20:17 +0200 |
commit | 9fa0477ab237c8ab0431dbeb5bcda53364ffffce (patch) | |
tree | 71455c7b54dfd407a420ab4562d92cd1109c9a7b | |
parent | d63803d477297d54b7b4034918a32086203caa43 (diff) | |
parent | 7c6602cd8d26c5cf39411900d60008affa4d3962 (diff) | |
download | nextcloud-server-9fa0477ab237c8ab0431dbeb5bcda53364ffffce.tar.gz nextcloud-server-9fa0477ab237c8ab0431dbeb5bcda53364ffffce.zip |
Merge pull request #52503 from nextcloud/fix/files_sharing/filter-own-reshared-shares
-rw-r--r-- | apps/files_sharing/lib/MountProvider.php | 2 | ||||
-rw-r--r-- | build/integration/files_features/transfer-ownership.feature | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/apps/files_sharing/lib/MountProvider.php b/apps/files_sharing/lib/MountProvider.php index 91c392de6eb..24d14630303 100644 --- a/apps/files_sharing/lib/MountProvider.php +++ b/apps/files_sharing/lib/MountProvider.php @@ -55,7 +55,7 @@ class MountProvider implements IMountProvider { // filter out excluded shares and group shares that includes self $shares = array_filter($shares, function (IShare $share) use ($user) { - return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID(); + return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID() && $share->getSharedBy() !== $user->getUID(); }); $superShares = $this->buildSuperShares($shares, $user); diff --git a/build/integration/files_features/transfer-ownership.feature b/build/integration/files_features/transfer-ownership.feature index 4e5407cadbb..b7da75421f0 100644 --- a/build/integration/files_features/transfer-ownership.feature +++ b/build/integration/files_features/transfer-ownership.feature @@ -210,19 +210,10 @@ Feature: transfer-ownership And user "user1" accepts last share When transferring ownership from "user0" to "user1" And the command was successful - And As an "user1" - Then Downloaded content when downloading file "/test/somefile.txt" with range "bytes=0-6" should be "This is" And using old dav path And as "user0" the folder "/test" exists And using received transfer folder of "user1" as dav path And as "user1" the folder "/test" does not exist - And As an "user1" - And Getting info of last share - And the OCS status code should be "100" - And Share fields of last share match with - | uid_owner | user1 | - | uid_file_owner | user3 | - | share_with | group1 | Scenario: transferring ownership of folder reshared with group to a user not in the group Given user "user0" exists |