Skip to content

[stable32] fix(secure-view): allow server-side file reads in SecureViewWrapper #5590

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
backportbot wants to merge 1 commit into
base: stable32
Choose a base branch
from
+9 −1
Open

[stable32] fix(secure-view): allow server-side file reads in SecureViewWrapper #5590

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
10 changes: 9 additions & 1 deletion lib/Storage/SecureViewWrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use OCP\Files\ForbiddenException;
use OCP\Files\IRootFolder;
use OCP\Files\Storage\IStorage;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\Server;

Expand All @@ -24,6 +25,7 @@ class SecureViewWrapper extends Wrapper {
private IRootFolder $rootFolder;
private IUserSession $userSession;
private SecureViewService $secureViewService;
private IRequest $request;

private string $mountPoint;

Expand All @@ -35,6 +37,7 @@ public function __construct(array $parameters) {
$this->rootFolder = Server::get(IRootFolder::class);
$this->userSession = Server::get(IUserSession::class);
$this->secureViewService = Server::get(SecureViewService::class);
$this->request = Server::get(IRequest::class);

$this->mountPoint = $parameters['mountPoint'];
}
Expand Down Expand Up @@ -79,7 +82,12 @@ public function rename(string $source, string $target): bool {
* @throws ForbiddenException
*/
private function checkFileAccess(string $path): void {
if (!$this->wopiMiddleware->isWOPIRequest() && $this->secureViewService->shouldSecure($path, $this, false)) {
// Only block direct client-facing downloads (GET requests). Server-side operations
// such as template creation and background jobs are non-GET or have no HTTP context
// and must not be blocked even when secure view applies.
if (!$this->wopiMiddleware->isWOPIRequest()
&& $this->request->getMethod() === 'GET'
&& $this->secureViewService->shouldSecure($path, $this, false)) {
throw new ForbiddenException('Download blocked due the secure view policy', false);
}
}
Expand Down
Loading