aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Repair.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/Repair.php')
-rw-r--r--lib/private/Repair.php203
1 files changed, 93 insertions, 110 deletions
diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index 91bfd47f5de..7fbf776d9a1 100644
--- a/lib/private/Repair.php
+++ b/lib/private/Repair.php
@@ -1,57 +1,32 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Daniel Kesselberg <mail@danielkesselberg.de>
- * @author Georg Ehrke <oc.list@georgehrke.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Michael Weimann <mail@michael-weimann.eu>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <vincent@nextcloud.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * 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, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OC;
-use OC\App\AppStore\Bundles\BundleFetcher;
-use OC\Avatar\AvatarManager;
-use OC\DB\Connection;
use OC\DB\ConnectionAdapter;
+use OC\Repair\AddAppConfigLazyMigration;
use OC\Repair\AddBruteForceCleanupJob;
+use OC\Repair\AddCleanupDeletedUsersBackgroundJob;
use OC\Repair\AddCleanupUpdaterBackupsJob;
+use OC\Repair\AddMetadataGenerationJob;
+use OC\Repair\AddRemoveOldTasksBackgroundJob;
use OC\Repair\CleanTags;
+use OC\Repair\CleanUpAbandonedApps;
use OC\Repair\ClearFrontendCaches;
use OC\Repair\ClearGeneratedAvatarCache;
use OC\Repair\Collation;
+use OC\Repair\Events\RepairAdvanceEvent;
+use OC\Repair\Events\RepairErrorEvent;
+use OC\Repair\Events\RepairFinishEvent;
+use OC\Repair\Events\RepairInfoEvent;
+use OC\Repair\Events\RepairStartEvent;
+use OC\Repair\Events\RepairStepEvent;
+use OC\Repair\Events\RepairWarningEvent;
use OC\Repair\MoveUpdaterStepFile;
-use OC\Repair\NC22\LookupServerSendCheck;
-use OC\Repair\Owncloud\CleanPreviews;
-use OC\Repair\Owncloud\MigrateOauthTables;
-use OC\Repair\NC11\FixMountStorages;
-use OC\Repair\Owncloud\MoveAvatars;
-use OC\Repair\Owncloud\InstallCoreBundle;
-use OC\Repair\Owncloud\UpdateLanguageCodes;
use OC\Repair\NC13\AddLogRotateJob;
use OC\Repair\NC14\AddPreviewBackgroundCleanupJob;
use OC\Repair\NC16\AddClenupLoginFlowV2BackgroundJob;
@@ -62,49 +37,55 @@ use OC\Repair\NC20\EncryptionLegacyCipher;
use OC\Repair\NC20\EncryptionMigration;
use OC\Repair\NC20\ShippedDashboardEnable;
use OC\Repair\NC21\AddCheckForUserCertificatesJob;
-use OC\Repair\NC21\ValidatePhoneNumber;
+use OC\Repair\NC22\LookupServerSendCheck;
+use OC\Repair\NC24\AddTokenCleanupJob;
+use OC\Repair\NC25\AddMissingSecretJob;
+use OC\Repair\NC29\SanitizeAccountProperties;
+use OC\Repair\NC30\RemoveLegacyDatadirFile;
use OC\Repair\OldGroupMembershipShares;
+use OC\Repair\Owncloud\CleanPreviews;
use OC\Repair\Owncloud\DropAccountTermsTable;
+use OC\Repair\Owncloud\MigrateOauthTables;
+use OC\Repair\Owncloud\MoveAvatars;
use OC\Repair\Owncloud\SaveAccountsTableData;
+use OC\Repair\Owncloud\UpdateLanguageCodes;
+use OC\Repair\RemoveBrokenProperties;
use OC\Repair\RemoveLinkShares;
use OC\Repair\RepairDavShares;
use OC\Repair\RepairInvalidShares;
+use OC\Repair\RepairLogoDimension;
use OC\Repair\RepairMimeTypes;
-use OC\Repair\SqliteAutoincrement;
use OC\Template\JSCombiner;
-use OC\Template\SCSSCacher;
+use OCA\DAV\Migration\DeleteSchedulingObjects;
use OCP\AppFramework\QueryException;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Collaboration\Resources\IManager;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Files\AppData\IAppDataFactory;
+use OCP\IAppConfig;
+use OCP\IConfig;
+use OCP\IDBConnection;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;
+use OCP\Notification\IManager as INotificationManager;
use Psr\Log\LoggerInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
use Throwable;
class Repair implements IOutput {
-
/** @var IRepairStep[] */
- private $repairSteps;
-
- /** @var EventDispatcherInterface */
- private $dispatcher;
+ private array $repairSteps = [];
- /** @var string */
- private $currentStep;
+ private string $currentStep;
- private LoggerInterface $logger;
+ public function __construct(
+ private IEventDispatcher $dispatcher,
+ private LoggerInterface $logger,
+ ) {
+ }
- /**
- * Creates a new repair step runner
- *
- * @param IRepairStep[] $repairSteps array of RepairStep instances
- */
- public function __construct(array $repairSteps, EventDispatcherInterface $dispatcher, LoggerInterface $logger) {
+ /** @param IRepairStep[] $repairSteps */
+ public function setRepairSteps(array $repairSteps): void {
$this->repairSteps = $repairSteps;
- $this->dispatcher = $dispatcher;
- $this->logger = $logger;
}
/**
@@ -112,21 +93,23 @@ class Repair implements IOutput {
*/
public function run() {
if (count($this->repairSteps) === 0) {
- $this->emit('\OC\Repair', 'info', ['No repair steps available']);
+ $this->dispatcher->dispatchTyped(new RepairInfoEvent('No repair steps available'));
return;
}
// run each repair step
foreach ($this->repairSteps as $step) {
$this->currentStep = $step->getName();
- $this->emit('\OC\Repair', 'step', [$this->currentStep]);
+ $this->dispatcher->dispatchTyped(new RepairStepEvent($this->currentStep));
try {
$step->run($this);
} catch (\Exception $e) {
- $this->logger->error("Exception while executing repair step " . $step->getName(), ['exception' => $e]);
- $this->emit('\OC\Repair', 'error', [$e->getMessage()]);
+ $this->logger->error('Exception while executing repair step ' . $step->getName(), ['exception' => $e]);
+ $this->dispatcher->dispatchTyped(new RepairErrorEvent($e->getMessage()));
}
}
+
+ $this->repairSteps = [];
}
/**
@@ -138,7 +121,7 @@ class Repair implements IOutput {
public function addStep($repairStep) {
if (is_string($repairStep)) {
try {
- $s = \OC::$server->query($repairStep);
+ $s = \OC::$server->get($repairStep);
} catch (QueryException $e) {
if (class_exists($repairStep)) {
try {
@@ -169,10 +152,9 @@ class Repair implements IOutput {
*
* @return IRepairStep[]
*/
- public static function getRepairSteps() {
+ public static function getRepairSteps(): array {
return [
new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->getDatabaseConnection(), false),
- new RepairMimeTypes(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
new MoveUpdaterStepFile(\OC::$server->getConfig()),
@@ -185,31 +167,35 @@ class Repair implements IOutput {
\OC::$server->getUserManager(),
\OC::$server->getConfig()
),
- new MigrateOauthTables(\OC::$server->get(Connection::class)),
- new FixMountStorages(\OC::$server->getDatabaseConnection()),
+ \OC::$server->get(MigrateOauthTables::class),
new UpdateLanguageCodes(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
- new InstallCoreBundle(
- \OC::$server->query(BundleFetcher::class),
- \OC::$server->getConfig(),
- \OC::$server->query(Installer::class)
- ),
new AddLogRotateJob(\OC::$server->getJobList()),
- new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
- new ClearGeneratedAvatarCache(\OC::$server->getConfig(), \OC::$server->query(AvatarManager::class)),
+ new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OCP\Server::get(JSCombiner::class)),
+ \OCP\Server::get(ClearGeneratedAvatarCache::class),
new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
- new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->get(LoggerInterface::class)),
+ new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OCP\Server::get(IAppDataFactory::class), \OC::$server->get(LoggerInterface::class)),
new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
- new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)),
- new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OC::$server->query(IManager::class)),
- \OC::$server->query(ResetGeneratedAvatarFlag::class),
- \OC::$server->query(EncryptionLegacyCipher::class),
- \OC::$server->query(EncryptionMigration::class),
- \OC::$server->get(ShippedDashboardEnable::class),
- \OC::$server->get(AddBruteForceCleanupJob::class),
- \OC::$server->get(AddCheckForUserCertificatesJob::class),
- \OC::$server->get(RepairDavShares::class),
- \OC::$server->get(LookupServerSendCheck::class),
+ new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->get(INotificationManager::class), \OCP\Server::get(ITimeFactory::class)),
+ new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OCP\Server::get(IManager::class)),
+ \OCP\Server::get(ResetGeneratedAvatarFlag::class),
+ \OCP\Server::get(EncryptionLegacyCipher::class),
+ \OCP\Server::get(EncryptionMigration::class),
+ \OCP\Server::get(ShippedDashboardEnable::class),
+ \OCP\Server::get(AddBruteForceCleanupJob::class),
+ \OCP\Server::get(AddCheckForUserCertificatesJob::class),
+ \OCP\Server::get(RepairDavShares::class),
+ \OCP\Server::get(LookupServerSendCheck::class),
+ \OCP\Server::get(AddTokenCleanupJob::class),
+ \OCP\Server::get(CleanUpAbandonedApps::class),
+ \OCP\Server::get(AddMissingSecretJob::class),
+ \OCP\Server::get(AddRemoveOldTasksBackgroundJob::class),
+ \OCP\Server::get(AddMetadataGenerationJob::class),
+ \OCP\Server::get(AddAppConfigLazyMigration::class),
+ \OCP\Server::get(RepairLogoDimension::class),
+ \OCP\Server::get(RemoveLegacyDatadirFile::class),
+ \OCP\Server::get(AddCleanupDeletedUsersBackgroundJob::class),
+ \OCP\Server::get(SanitizeAccountProperties::class),
];
}
@@ -222,7 +208,13 @@ class Repair implements IOutput {
public static function getExpensiveRepairSteps() {
return [
new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
- \OC::$server->get(ValidatePhoneNumber::class),
+ new RemoveBrokenProperties(\OCP\Server::get(IDBConnection::class)),
+ new RepairMimeTypes(
+ \OCP\Server::get(IConfig::class),
+ \OCP\Server::get(IAppConfig::class),
+ \OCP\Server::get(IDBConnection::class)
+ ),
+ \OCP\Server::get(DeleteSchedulingObjects::class),
];
}
@@ -233,14 +225,11 @@ class Repair implements IOutput {
* @return IRepairStep[]
*/
public static function getBeforeUpgradeRepairSteps() {
- /** @var Connection $connection */
- $connection = \OC::$server->get(Connection::class);
/** @var ConnectionAdapter $connectionAdapter */
$connectionAdapter = \OC::$server->get(ConnectionAdapter::class);
$config = \OC::$server->getConfig();
$steps = [
new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), $connectionAdapter, true),
- new SqliteAutoincrement($connection),
new SaveAccountsTableData($connectionAdapter, $config),
new DropAccountTermsTable($connectionAdapter),
];
@@ -248,21 +237,15 @@ class Repair implements IOutput {
return $steps;
}
- /**
- * @param string $scope
- * @param string $method
- * @param array $arguments
- */
- public function emit($scope, $method, array $arguments = []) {
- if (!is_null($this->dispatcher)) {
- $this->dispatcher->dispatch("$scope::$method",
- new GenericEvent("$scope::$method", $arguments));
- }
+ public function debug(string $message): void {
}
- public function info($string) {
+ /**
+ * @param string $message
+ */
+ public function info($message) {
// for now just emit as we did in the past
- $this->emit('\OC\Repair', 'info', [$string]);
+ $this->dispatcher->dispatchTyped(new RepairInfoEvent($message));
}
/**
@@ -270,7 +253,7 @@ class Repair implements IOutput {
*/
public function warning($message) {
// for now just emit as we did in the past
- $this->emit('\OC\Repair', 'warning', [$message]);
+ $this->dispatcher->dispatchTyped(new RepairWarningEvent($message));
}
/**
@@ -278,16 +261,16 @@ class Repair implements IOutput {
*/
public function startProgress($max = 0) {
// for now just emit as we did in the past
- $this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
+ $this->dispatcher->dispatchTyped(new RepairStartEvent($max, $this->currentStep));
}
/**
- * @param int $step
+ * @param int $step number of step to advance
* @param string $description
*/
public function advance($step = 1, $description = '') {
// for now just emit as we did in the past
- $this->emit('\OC\Repair', 'advance', [$step, $description]);
+ $this->dispatcher->dispatchTyped(new RepairAdvanceEvent($step, $description));
}
/**
@@ -295,6 +278,6 @@ class Repair implements IOutput {
*/
public function finishProgress() {
// for now just emit as we did in the past
- $this->emit('\OC\Repair', 'finishProgress', []);
+ $this->dispatcher->dispatchTyped(new RepairFinishEvent());
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-15 07:33:01 +0000