mirror of
https://github.com/projectsend/projectsend.git
synced 2026-09-16 16:45:07 +00:00
denkfabrik-li
c8de16101f
FilePolicy::view() has two halves for staff: one of the three file keys
(upload / edit_files / edit_others_files), AND StaffLibraryScope. Every
comment surface that spans files narrowed by the library half alone.
A role holding moderate_comments and no file key therefore got a 403 on
every file in the installation while reading every comment written about
them on /comments: the text, staff-only notes, the client name a
Clients-visibility comment carries, and a visitor's IP address. The API
queue answered the same way, and approving through it hands the body back
in the response, so it was a reading door as well as a writing one.
The class says this is not supposed to happen -- across()'s own docblock
("a moderation screen is not a way around the visibility model"), the
route comment on /comments ("the list itself is still narrowed by
VisibleCommentScope, so holding the permission does not widen what a
viewer may read"), and routes/api.php ("reading and writing a comment is
gated by 'may see this file', the same three keys the file endpoints
use"). FileCommentPolicy::view() enforces it for a single comment, by
running the file's own gate first. Only the cross-file queries did not.
So they now take their files from ViewableFileScope, which is
FilePolicy::view() expressed as a query, instead of from StaffLibraryScope,
which is only its second half: across(), pendingTotal() and the API's
pending list. The permission half moves into a named method on that class,
since three modules now ask the same question.
FileCommentPolicy::moderate() gets it too, in both forms. Its row form is
otherwise unchanged -- the library check still runs by file id, so a
comment on a soft-deleted file behaves exactly as before.
No system role changes behaviour: Account Manager and System Administrator
are the two that ship with moderate_comments, and both hold upload. What
changes is a hand-built role that holds moderation and nothing else.
Seven tests. Without the fix, five go red; the other two are the premise
(that the viewer really is refused the file itself) and the guard that a
moderator who may read files still moderates the whole installation.
docs/api/openapi.json regenerated for the one changed description.
65 lines
2.2 KiB
PHP
65 lines
2.2 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Modules\Files\Access;
|
|
|
|
use App\Models\User;
|
|
use App\Modules\Files\Models\File;
|
|
use Illuminate\Database\Eloquent\Builder;
|
|
|
|
/**
|
|
* FilePolicy::view() expressed as a query instead of a per-model check —
|
|
* the same rules, evaluated in SQL so a caller can ask "every file this
|
|
* user may see" without loading candidates first.
|
|
*
|
|
* This exists because a folder is not a bag of uniformly-visible files: a
|
|
* user may hold a folder while individual files inside it are not theirs
|
|
* to read (a client's expired file is the live case — see
|
|
* File::scopeVisibleToClient, which ends in notExpired()). Anything that
|
|
* expands a folder into its contents must therefore re-derive visibility
|
|
* per file rather than inherit it from the folder, or the folder becomes a
|
|
* way around the per-file rule. BuildZipDownloadJob is the first such
|
|
* caller; any future bulk operation over a subtree is the next.
|
|
*
|
|
* Keep this in lockstep with FilePolicy::view(). The policy stays the
|
|
* authority for a single known file; this is its set-shaped twin.
|
|
*/
|
|
class ViewableFileScope
|
|
{
|
|
public function __construct(
|
|
private readonly StaffLibraryScope $scope,
|
|
) {}
|
|
|
|
/**
|
|
* @return Builder<File>
|
|
*/
|
|
public function for(User $user): Builder
|
|
{
|
|
if (! $user->isStaff()) {
|
|
return File::query()->visibleToClient($user);
|
|
}
|
|
|
|
if (! $this->permitsAnyFile($user)) {
|
|
return File::query()->whereRaw('1 = 0');
|
|
}
|
|
|
|
return $this->scope->files($user);
|
|
}
|
|
|
|
/**
|
|
* Whether a staff member holds any of the three keys that open file
|
|
* reading at all — the permission half of FilePolicy::view()'s staff
|
|
* branch, named once because more than one module has to ask it.
|
|
*
|
|
* It is a property of the viewer rather than of a row, so it either
|
|
* opens the whole scope or closes it entirely. That is also why a
|
|
* query narrowed by StaffLibraryScope alone is only half the check:
|
|
* the library says *which* files, this says *whether any*.
|
|
*/
|
|
public function permitsAnyFile(User $user): bool
|
|
{
|
|
return $user->can('upload') || $user->can('edit_files') || $user->can('edit_others_files');
|
|
}
|
|
}
|