-
-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44967 from nextcloud/perf/sharing-events
perf(files_sharing): Move events to listener classes and registration instead of boot
- Loading branch information
Showing
6 changed files
with
176 additions
and
88 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
apps/files_sharing/lib/Listener/BeforeDirectFileDownloadListener.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2019, Roeland Jago Douma <[email protected]> | ||
| * | ||
| * @author John Molakvoæ <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\Files_Sharing\Listener; | ||
|
|
||
| use OCA\Files_Sharing\ViewOnly; | ||
| use OCP\EventDispatcher\Event; | ||
| use OCP\EventDispatcher\IEventListener; | ||
| use OCP\Files\Events\BeforeDirectFileDownloadEvent; | ||
| use OCP\Files\IRootFolder; | ||
| use OCP\IUserSession; | ||
|
|
||
| /** | ||
| * @template-implements IEventListener<BeforeDirectFileDownloadEvent|Event> | ||
| */ | ||
| class BeforeDirectFileDownloadListener implements IEventListener { | ||
|
|
||
| public function __construct( | ||
| private IUserSession $userSession, | ||
| private IRootFolder $rootFolder, | ||
| ) { | ||
| } | ||
|
|
||
| public function handle(Event $event): void { | ||
| if (!($event instanceof BeforeDirectFileDownloadEvent)) { | ||
| return; | ||
| } | ||
|
|
||
| $pathsToCheck = [$event->getPath()]; | ||
| // Check only for user/group shares. Don't restrict e.g. share links | ||
| $user = $this->userSession->getUser(); | ||
| if ($user) { | ||
| $viewOnlyHandler = new ViewOnly( | ||
| $this->rootFolder->getUserFolder($user->getUID()) | ||
| ); | ||
| if (!$viewOnlyHandler->check($pathsToCheck)) { | ||
| $event->setSuccessful(false); | ||
| $event->setErrorMessage('Access to this resource or one of its sub-items has been denied.'); | ||
| } | ||
| } | ||
| } | ||
| } |
76 changes: 76 additions & 0 deletions
76
apps/files_sharing/lib/Listener/BeforeZipCreatedListener.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2019, Roeland Jago Douma <[email protected]> | ||
| * | ||
| * @author John Molakvoæ <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\Files_Sharing\Listener; | ||
|
|
||
| use OCA\Files_Sharing\ViewOnly; | ||
| use OCP\EventDispatcher\Event; | ||
| use OCP\EventDispatcher\IEventListener; | ||
| use OCP\Files\Events\BeforeZipCreatedEvent; | ||
| use OCP\Files\IRootFolder; | ||
| use OCP\IUserSession; | ||
|
|
||
| /** | ||
| * @template-implements IEventListener<BeforeZipCreatedEvent|Event> | ||
| */ | ||
| class BeforeZipCreatedListener implements IEventListener { | ||
|
|
||
| public function __construct( | ||
| private IUserSession $userSession, | ||
| private IRootFolder $rootFolder, | ||
| ) { | ||
| } | ||
|
|
||
| public function handle(Event $event): void { | ||
| if (!($event instanceof BeforeZipCreatedEvent)) { | ||
| return; | ||
| } | ||
|
|
||
| $dir = $event->getDirectory(); | ||
| $files = $event->getFiles(); | ||
|
|
||
| $pathsToCheck = []; | ||
| foreach ($files as $file) { | ||
| $pathsToCheck[] = $dir . '/' . $file; | ||
| } | ||
|
|
||
| // Check only for user/group shares. Don't restrict e.g. share links | ||
| $user = $this->userSession->getUser(); | ||
| if ($user) { | ||
| $viewOnlyHandler = new ViewOnly( | ||
| $this->rootFolder->getUserFolder($user->getUID()) | ||
| ); | ||
| if (!$viewOnlyHandler->check($pathsToCheck)) { | ||
| $event->setErrorMessage('Access to this resource or one of its sub-items has been denied.'); | ||
| $event->setSuccessful(false); | ||
| } else { | ||
| $event->setSuccessful(true); | ||
| } | ||
| } else { | ||
| $event->setSuccessful(true); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters