Skip to content

fix: rely on quota to restrict file uploads #1494

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
solracsf wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −55
Open

fix: rely on quota to restrict file uploads #1494

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
26 changes: 0 additions & 26 deletions lib/Hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,8 @@

namespace OCA\Guests;

use OC\Files\Filesystem;
use OCA\Guests\AppInfo\Application;
use OCA\Guests\Service\InviteService;
use OCA\Guests\Storage\ReadOnlyJail;
use OCP\Constants;
use OCP\Files\Storage\IStorage;
use OCP\IConfig;
use OCP\IUserManager;
use OCP\IUserSession;
Expand Down Expand Up @@ -76,28 +72,6 @@ public function handlePostShare(ShareCreatedEvent $event): void {
$this->inviteService->sendInvite($uid, $shareWith, $share);
}

/**
* @param array<string, mixed> $params
*/
public function setupReadonlyFilesystem(array $params): void {
$uid = $params['user'];
$user = $this->userManager->get($uid);

if ($user && $this->guestManager->isGuest($user)) {
Filesystem::addStorageWrapper('guests.readonly', function ($mountPoint, IStorage $storage) use ($uid): ReadOnlyJail|IStorage {
if ($mountPoint === sprintf('/%s/', $uid)) {
return new ReadOnlyJail([
'storage' => $storage,
'mask' => Constants::PERMISSION_READ,
'path' => 'files'
]);
}

return $storage;
});
}
}

public function handleFirstLogin(UserFirstTimeLoggedInEvent $event): void {
if (!$this->config->getSystemValueBool('migrate_guest_user_data', false)) {
return;
Expand Down
2 changes: 0 additions & 2 deletions lib/RestrictionManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
use OCP\IUserSession;
use OCP\Server;
use OCP\Settings\IManager;
use OCP\Util;
use Psr\Log\LoggerInterface;

class RestrictionManager {
Expand Down Expand Up @@ -54,7 +53,6 @@ public function setupRestrictions(): void {
}

if ($this->guestManager->isGuest($user)) {
Util::connectHook('OC_Filesystem', 'preSetup', $this->hooks, 'setupReadonlyFilesystem');
if (!$this->config->allowExternalStorage()) {
$this->mountProviderCollection->registerMountFilter(fn (IMountPoint $mountPoint, IUser $user): bool => !($mountPoint instanceof ExternalMountPoint && $this->guestManager->isGuest($user)));
}
Expand Down
27 changes: 0 additions & 27 deletions lib/Storage/ReadOnlyJail.php
View file
Open in desktop

This file was deleted.

Loading