Skip to content

fix(filesintegration): Use UserFolder to check for access #16891

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

Open
nickvergessen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(filesintegration): Use UserFolder to check for access #16891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 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,7 @@ 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());
$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
7 changes: 4 additions & 3 deletions lib/Files/Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ 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);
$nodes = $userFolder->getById((int)$fileId);

if (empty($nodes)) {
return [];
Expand All @@ -64,7 +65,7 @@ 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 {
Expand Down
Loading