Skip to content

Workaround to avoid logging errors when browsing public albums #1671

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
starypatyk wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Open

Workaround to avoid logging errors when browsing public albums #1671

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
13 changes: 12 additions & 1 deletion lib/Db/FsManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
use OCP\IRequest;
use OCP\IUserManager;
use OCP\IUserSession;
use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IShare;

final class FsManager
Expand Down Expand Up @@ -317,7 +318,17 @@ public function getShareObject(): ?IShare
}

// Get share by token
$share = \OC::$server->get(\OCP\Share\IManager::class)->getShareByToken($token);
$share = null;

// This might be invoked for public albums, in this case the token parameter
// contains the collaborator_id of the album rather than a proper share token.
//
// Catch the ShareNotFound exception to enable further processing of the request.
try {
$share = \OC::$server->get(\OCP\Share\IManager::class)->getShareByToken($token);
} catch (ShareNotFound $e) {
return null;
}
if (!self::validateShare($share)) {
return null;
}
Expand Down