aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_external/lib/Command/Notify.php
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_external/lib/Command/Notify.php')
-rw-r--r--apps/files_external/lib/Command/Notify.php115
1 files changed, 13 insertions, 102 deletions
diff --git a/apps/files_external/lib/Command/Notify.php b/apps/files_external/lib/Command/Notify.php
index fd3a66a756e..0982aa5598b 100644
--- a/apps/files_external/lib/Command/Notify.php
+++ b/apps/files_external/lib/Command/Notify.php
@@ -3,36 +3,12 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2016 Robin Appelman <robin@icewind.nl>
- *
- * @author Ari Selseng <ari@selseng.net>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @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/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\Files_External\Command;
use Doctrine\DBAL\Exception\DriverException;
-use OC\Core\Command\Base;
-use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
-use OCA\Files_External\Lib\StorageConfig;
use OCA\Files_External\Service\GlobalStoragesService;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Files\Notify\IChange;
@@ -40,7 +16,6 @@ use OCP\Files\Notify\INotifyHandler;
use OCP\Files\Notify\IRenameChange;
use OCP\Files\Storage\INotifyStorage;
use OCP\Files\Storage\IStorage;
-use OCP\Files\StorageNotAvailableException;
use OCP\IDBConnection;
use OCP\IUserManager;
use Psr\Log\LoggerInterface;
@@ -49,14 +24,14 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
-class Notify extends Base {
+class Notify extends StorageAuthBase {
public function __construct(
- private GlobalStoragesService $globalService,
private IDBConnection $connection,
private LoggerInterface $logger,
- private IUserManager $userManager
+ GlobalStoragesService $globalService,
+ IUserManager $userManager,
) {
- parent::__construct();
+ parent::__construct($globalService, $userManager);
}
protected function configure(): void {
@@ -97,71 +72,12 @@ class Notify extends Base {
parent::configure();
}
- private function getUserOption(InputInterface $input): ?string {
- if ($input->getOption('user')) {
- return (string)$input->getOption('user');
- }
-
- return $_ENV['NOTIFY_USER'] ?? $_SERVER['NOTIFY_USER'] ?? null;
- }
-
- private function getPasswordOption(InputInterface $input): ?string {
- if ($input->getOption('password')) {
- return (string)$input->getOption('password');
- }
-
- return $_ENV['NOTIFY_PASSWORD'] ?? $_SERVER['NOTIFY_PASSWORD'] ?? null;
- }
-
protected function execute(InputInterface $input, OutputInterface $output): int {
- $mount = $this->globalService->getStorage($input->getArgument('mount_id'));
- if (is_null($mount)) {
- $output->writeln('<error>Mount not found</error>');
+ [$mount, $storage] = $this->createStorage($input, $output);
+ if ($storage === null) {
return self::FAILURE;
}
- $noAuth = false;
-
- $userOption = $this->getUserOption($input);
- $passwordOption = $this->getPasswordOption($input);
-
- // if only the user is provided, we get the user object to pass along to the auth backend
- // this allows using saved user credentials
- $user = ($userOption && !$passwordOption) ? $this->userManager->get($userOption) : null;
-
- try {
- $authBackend = $mount->getAuthMechanism();
- $authBackend->manipulateStorageConfig($mount, $user);
- } catch (InsufficientDataForMeaningfulAnswerException $e) {
- $noAuth = true;
- } catch (StorageNotAvailableException $e) {
- $noAuth = true;
- }
- if ($userOption) {
- $mount->setBackendOption('user', $userOption);
- }
- if ($passwordOption) {
- $mount->setBackendOption('password', $passwordOption);
- }
-
- try {
- $backend = $mount->getBackend();
- $backend->manipulateStorageConfig($mount, $user);
- } catch (InsufficientDataForMeaningfulAnswerException $e) {
- $noAuth = true;
- } catch (StorageNotAvailableException $e) {
- $noAuth = true;
- }
-
- try {
- $storage = $this->createStorage($mount);
- } catch (\Exception $e) {
- $output->writeln('<error>Error while trying to create storage</error>');
- if ($noAuth) {
- $output->writeln('<error>Username and/or password required</error>');
- }
- return self::FAILURE;
- }
if (!$storage instanceof INotifyStorage) {
$output->writeln('<error>Mount of type "' . $mount->getBackend()->getText() . '" does not support active update notifications</error>');
return self::FAILURE;
@@ -179,7 +95,7 @@ class Notify extends Base {
$this->selfTest($storage, $notifyHandler, $output);
}
- $notifyHandler->listen(function (IChange $change) use ($mount, $output, $dryRun) {
+ $notifyHandler->listen(function (IChange $change) use ($mount, $output, $dryRun): void {
$this->logUpdate($change, $output);
if ($change instanceof IRenameChange) {
$this->markParentAsOutdated($mount->getId(), $change->getTargetPath(), $output, $dryRun);
@@ -189,11 +105,6 @@ class Notify extends Base {
return self::SUCCESS;
}
- private function createStorage(StorageConfig $mount): IStorage {
- $class = $mount->getBackend()->getStorageClass();
- return new $class($mount->getBackendOptions());
- }
-
private function markParentAsOutdated($mountId, $path, OutputInterface $output, bool $dryRun): void {
$parent = ltrim(dirname($path), '/');
if ($parent === '.') {
@@ -225,7 +136,7 @@ class Notify extends Base {
$storageIds = array_values(array_unique($storageIds));
if ($dryRun) {
- $output->writeln(" dry-run: skipping database write");
+ $output->writeln(' dry-run: skipping database write');
} else {
$result = $this->updateParent($storageIds, $parent);
if ($result === 0) {
@@ -257,7 +168,7 @@ class Notify extends Base {
}
private function getStorageIds(int $mountId, string $path): array {
- $pathHash = md5(trim((string)\OC_Util::normalizeUnicode($path), '/'));
+ $pathHash = md5(trim(\OC_Util::normalizeUnicode($path), '/'));
$qb = $this->connection->getQueryBuilder();
return $qb
->select('storage_id', 'user_id')
@@ -270,7 +181,7 @@ class Notify extends Base {
}
private function updateParent(array $storageIds, string $parent): int {
- $pathHash = md5(trim((string)\OC_Util::normalizeUnicode($parent), '/'));
+ $pathHash = md5(trim(\OC_Util::normalizeUnicode($parent), '/'));
$qb = $this->connection->getQueryBuilder();
return $qb
->update('filecache')
@@ -304,7 +215,7 @@ class Notify extends Base {
private function selfTest(IStorage $storage, INotifyHandler $notifyHandler, OutputInterface $output): void {
usleep(100 * 1000); //give time for the notify to start
if (!$storage->file_put_contents('/.nc_test_file.txt', 'test content')) {
- $output->writeln("Failed to create test file for self-test");
+ $output->writeln('Failed to create test file for self-test');
return;
}
$storage->mkdir('/.nc_test_folder');
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-14 20:51:05 +0000