Skip to content

[stable33] test: Revert "TBD but for now all users with access to a file can be… #16970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miaulalala merged 2 commits into from
Feb 4, 2026
+13 −14
Merged

[stable33] test: Revert "TBD but for now all users with access to a file can be… #16970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e77f5f
test: Revert "TBD but for now all users with access to a file can be …
nickvergessen Feb 3, 2026
105a815
perf(sharing): Use `getFirstNodeById()` and limit to IUserFolder
nickvergessen Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/Chat/AutoComplete/SearchPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ public function setContext(array $context): void {
#[\Override]
public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
if ($this->room->getObjectType() === 'file') {
$usersWithFileAccess = $this->util->getUsersWithAccessFile($this->room->getObjectId());
if ($this->userId === null) {
$usersWithFileAccess = $this->util->canGuestsAccessFile($this->room->getObjectId());
} else {
$usersWithFileAccess = $this->util->getUsersWithAccessFile($this->room->getObjectId(), $this->userId);
}
if (!empty($usersWithFileAccess)) {
$users = [];
foreach ($usersWithFileAccess as $userId) {
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/FilesIntegrationController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public function getRoomByFileId(string $fileId): DataResponse {
throw new OCSNotFoundException($this->l->t('File is not shared, or shared but not with the user'));
}

$users = $this->util->getUsersWithAccessFile($fileId);
$users = $this->util->getUsersWithAccessFile($fileId, $currentUser->getUID());
if (count($users) <= 1 && !$this->util->canGuestsAccessFile($fileId)) {
throw new OCSNotFoundException($this->l->t('File is not shared, or shared but not with the user'));
}
Expand Down
15 changes: 7 additions & 8 deletions lib/Files/Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ public function __construct(
/**
* @return string[]
*/
public function getUsersWithAccessFile(string $fileId): array {
public function getUsersWithAccessFile(string $fileId, string $userId): array {
if (!isset($this->accessLists[$fileId])) {
$nodes = $this->rootFolder->getById((int)$fileId);
$userFolder = $this->rootFolder->getUserFolder($userId);
$node = $userFolder->getFirstNodeById((int)$fileId);

if (empty($nodes)) {
if ($node === null) {
return [];
}

$node = array_shift($nodes);
$accessList = $this->shareManager->getAccessList($node);
$accessList['users'] ??= [];
if (!$node->getStorage()->instanceOfStorage(SharedStorage::class)) {
Expand All @@ -64,18 +64,17 @@ public function getUsersWithAccessFile(string $fileId): array {
}

public function canUserAccessFile(string $fileId, string $userId): bool {
return \in_array($userId, $this->getUsersWithAccessFile($fileId), true);
return \in_array($userId, $this->getUsersWithAccessFile($fileId, $userId), true);
}

public function canGuestsAccessFile(string $fileId): bool {
if (!isset($this->publicAccessLists[$fileId])) {
$nodes = $this->rootFolder->getById((int)$fileId);
$node = $this->rootFolder->getFirstNodeById((int)$fileId);

if (empty($nodes)) {
if ($node === null) {
return false;
}

$node = array_shift($nodes);
$accessList = $this->shareManager->getAccessList($node, false);
$this->publicAccessLists[$fileId] = $accessList['public'] ?? false;
}
Expand Down
4 changes: 0 additions & 4 deletions tests/integration/features/chat-2/mentions.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,6 @@ Feature: chat/mentions
| all | welcome.txt | calls | all |
| participant1 | participant1-displayname | users | participant1 |
| participant2 | participant2-displayname | users | participant2 |
| participant4 | participant4-displayname | users | participant4 |
| participant3 | participant3-displayname | users | participant3 |
| GUEST_ID | Guest | guests | GUEST_ID |
# Guests can not mention users with access to the file that have not joined
Expand All @@ -455,7 +454,6 @@ Feature: chat/mentions
| participant1 | participant1-displayname | users | participant1 |
| participant2 | participant2-displayname | users | participant2 |
| participant3 | participant3-displayname | users | participant3 |
| participant4 | participant4-displayname | users | participant4 |
| GUEST_ID | Guest | guests | GUEST_ID |

Scenario: get matched mentions in a room for a file shared by link
Expand Down Expand Up @@ -499,7 +497,6 @@ Feature: chat/mentions
| id | label | source | mentionId |
| participant1 | participant1-displayname | users | participant1 |
| participant2 | participant2-displayname | users | participant2 |
| participant4 | participant4-displayname | users | participant4 |
| participant3 | participant3-displayname | users | participant3 |
# Guests can not mention users with access to the file that have not joined
# the room.
Expand All @@ -508,7 +505,6 @@ Feature: chat/mentions
| participant1 | participant1-displayname | users | participant1 |
| participant2 | participant2-displayname | users | participant2 |
| participant3 | participant3-displayname | users | participant3 |
| participant4 | participant4-displayname | users | participant4 |

Scenario: get unmatched mentions in a room for a file shared by link
Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
Expand Down
Loading