Skip to content

fix: attachment visibility for authenticated users via shared links #6878

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
max-nextcloud merged 1 commit into from
Feb 5, 2025
Merged

fix: attachment visibility for authenticated users via shared links #6878

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
19 changes: 11 additions & 8 deletions lib/Middleware/SessionMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,14 @@ private function assertDocumentSession(ISessionAwareController $controller): voi
private function assertUserOrShareToken(ISessionAwareController $controller): void {
$documentId = (int)$this->request->getParam('documentId');
if (null !== $userId = $this->userSession->getUser()?->getUID()) {
// Check if user has access to document
if ($this->rootFolder->getUserFolder($userId)->getFirstNodeById($documentId) === null) {
throw new InvalidSessionException();
if ($this->rootFolder->getUserFolder($userId)->getFirstNodeById($documentId) !== null) {
$controller->setUserId($userId);
$controller->setDocumentId($documentId);
return;
}
$controller->setUserId($userId);
} elseif ('' !== $shareToken = (string)$this->request->getParam('shareToken')) {
}

if ('' !== $shareToken = (string)$this->request->getParam('shareToken')) {
try {
$share = $this->shareManager->getShareByToken($shareToken);
} catch (ShareNotFound) {
Expand All @@ -155,11 +157,12 @@ private function assertUserOrShareToken(ISessionAwareController $controller): vo
if ($attributes !== null && $attributes->getAttribute('permissions', 'download') === false) {
throw new InvalidSessionException();
}
} else {
throw new InvalidSessionException();

$controller->setDocumentId($documentId);
return;
}

$controller->setDocumentId($documentId);
throw new InvalidSessionException();
}

public function afterException($controller, $methodName, \Exception $exception): JSONResponse|Response {
Expand Down
Loading