aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Updater.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/Updater.php')
-rw-r--r--lib/private/Updater.php257
1 files changed, 96 insertions, 161 deletions
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index 2c06cffcb19..9cd33863612 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -3,56 +3,37 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Frank Karlitschek <frank@karlitschek.de>
- * @author Georg Ehrke <oc.list@georgehrke.com>
- * @author J0WI <J0WI@users.noreply.github.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Steffen Lindner <mail@steffen-lindner.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Victor Dubiniuk <dubiniuk@owncloud.com>
- * @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 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OC;
use OC\App\AppManager;
+use OC\App\AppStore\Fetcher\AppFetcher;
use OC\DB\Connection;
use OC\DB\MigrationService;
+use OC\DB\MigratorExecuteSqlEvent;
use OC\Hooks\BasicEmitter;
use OC\IntegrityCheck\Checker;
+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_App;
use OCP\App\IAppManager;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventDispatcher;
use OCP\HintException;
+use OCP\IAppConfig;
use OCP\IConfig;
use OCP\ILogger;
+use OCP\ServerVersion;
use OCP\Util;
use Psr\Log\LoggerInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
/**
* Class that handles autoupdating of ownCloud
@@ -64,20 +45,7 @@ use Symfony\Component\EventDispatcher\GenericEvent;
* - failure(string $message)
*/
class Updater extends BasicEmitter {
-
- /** @var LoggerInterface */
- private $log;
-
- /** @var IConfig */
- private $config;
-
- /** @var Checker */
- private $checker;
-
- /** @var Installer */
- private $installer;
-
- private $logLevelNames = [
+ private array $logLevelNames = [
0 => 'Debug',
1 => 'Info',
2 => 'Warning',
@@ -85,14 +53,14 @@ class Updater extends BasicEmitter {
4 => 'Fatal',
];
- public function __construct(IConfig $config,
- Checker $checker,
- ?LoggerInterface $log,
- Installer $installer) {
- $this->log = $log;
- $this->config = $config;
- $this->checker = $checker;
- $this->installer = $installer;
+ public function __construct(
+ private ServerVersion $serverVersion,
+ private IConfig $config,
+ private IAppConfig $appConfig,
+ private Checker $checker,
+ private ?LoggerInterface $log,
+ private Installer $installer,
+ ) {
}
/**
@@ -102,7 +70,6 @@ class Updater extends BasicEmitter {
* @return bool true if the operation succeeded, false otherwise
*/
public function upgrade(): bool {
- $this->emitRepairEvents();
$this->logAllEvents();
$logLevel = $this->config->getSystemValue('loglevel', ILogger::WARN);
@@ -117,14 +84,14 @@ class Updater extends BasicEmitter {
}
// Clear CAN_INSTALL file if not on git
- if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) {
+ if ($this->serverVersion->getChannel() !== 'git' && is_file(\OC::$configDir . '/CAN_INSTALL')) {
if (!unlink(\OC::$configDir . '/CAN_INSTALL')) {
$this->log->error('Could not cleanup CAN_INSTALL from your config folder. Please remove this file manually.');
}
}
- $installedVersion = $this->config->getSystemValue('version', '0.0.0');
- $currentVersion = implode('.', \OCP\Util::getVersion());
+ $installedVersion = $this->config->getSystemValueString('version', '0.0.0');
+ $currentVersion = implode('.', $this->serverVersion->getVersion());
$this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, ['app' => 'core']);
@@ -135,13 +102,13 @@ class Updater extends BasicEmitter {
$this->log->error($exception->getMessage(), [
'exception' => $exception,
]);
- $this->emit('\OC\Updater', 'failure', [$exception->getMessage() . ': ' .$exception->getHint()]);
+ $this->emit('\OC\Updater', 'failure', [$exception->getMessage() . ': ' . $exception->getHint()]);
$success = false;
} catch (\Exception $exception) {
$this->log->error($exception->getMessage(), [
'exception' => $exception,
]);
- $this->emit('\OC\Updater', 'failure', [get_class($exception) . ': ' .$exception->getMessage()]);
+ $this->emit('\OC\Updater', 'failure', [get_class($exception) . ': ' . $exception->getMessage()]);
$success = false;
}
@@ -182,7 +149,7 @@ class Updater extends BasicEmitter {
// this should really be a JSON file
require \OC::$SERVERROOT . '/version.php';
/** @var string $vendor */
- return (string) $vendor;
+ return (string)$vendor;
}
/**
@@ -200,8 +167,8 @@ class Updater extends BasicEmitter {
// Vendor was not set correctly on install, so we have to white-list known versions
if ($currentVendor === '' && (
- isset($allowedPreviousVersions['owncloud'][$oldVersion]) ||
- isset($allowedPreviousVersions['owncloud'][$majorMinor])
+ isset($allowedPreviousVersions['owncloud'][$oldVersion])
+ || isset($allowedPreviousVersions['owncloud'][$majorMinor])
)) {
$currentVendor = 'owncloud';
$this->config->setAppValue('core', 'vendor', $currentVendor);
@@ -209,13 +176,13 @@ class Updater extends BasicEmitter {
if ($currentVendor === 'nextcloud') {
return isset($allowedPreviousVersions[$currentVendor][$majorMinor])
- && (version_compare($oldVersion, $newVersion, '<=') ||
- $this->config->getSystemValue('debug', false));
+ && (version_compare($oldVersion, $newVersion, '<=')
+ || $this->config->getSystemValueBool('debug', false));
}
// Check if the instance can be migrated
- return isset($allowedPreviousVersions[$currentVendor][$majorMinor]) ||
- isset($allowedPreviousVersions[$currentVendor][$oldVersion]);
+ return isset($allowedPreviousVersions[$currentVendor][$majorMinor])
+ || isset($allowedPreviousVersions[$currentVendor][$oldVersion]);
}
/**
@@ -243,12 +210,16 @@ class Updater extends BasicEmitter {
}
// create empty file in data dir, so we can later find
- // out that this is indeed an ownCloud data directory
+ // out that this is indeed a Nextcloud data directory
// (in case it didn't exist before)
- file_put_contents($this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', '');
+ file_put_contents(
+ $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data') . '/.ncdata',
+ "# Nextcloud data directory\n# Do not change this file",
+ );
// pre-upgrade repairs
- $repair = new Repair(Repair::getBeforeUpgradeRepairSteps(), \OC::$server->getEventDispatcher(), \OC::$server->get(LoggerInterface::class));
+ $repair = \OCP\Server::get(Repair::class);
+ $repair->setRepairSteps(Repair::getBeforeUpgradeRepairSteps());
$repair->run();
$this->doCoreUpgrade();
@@ -265,13 +236,13 @@ class Updater extends BasicEmitter {
$this->doAppUpgrade();
// Update the appfetchers version so it downloads the correct list from the appstore
- \OC::$server->getAppFetcher()->setVersion($currentVersion);
+ \OC::$server->get(AppFetcher::class)->setVersion($currentVersion);
- /** @var IAppManager|AppManager $appManager */
+ /** @var AppManager $appManager */
$appManager = \OC::$server->getAppManager();
// upgrade appstore apps
- $this->upgradeAppStoreApps($appManager->getInstalledApps());
+ $this->upgradeAppStoreApps($appManager->getEnabledApps());
$autoDisabledApps = $appManager->getAutoDisabledApps();
if (!empty($autoDisabledApps)) {
$this->upgradeAppStoreApps(array_keys($autoDisabledApps), $autoDisabledApps);
@@ -289,11 +260,12 @@ class Updater extends BasicEmitter {
}
// post-upgrade repairs
- $repair = new Repair(Repair::getRepairSteps(), \OC::$server->getEventDispatcher(), \OC::$server->get(LoggerInterface::class));
+ $repair = \OCP\Server::get(Repair::class);
+ $repair->setRepairSteps(Repair::getRepairSteps());
$repair->run();
//Invalidate update feed
- $this->config->setAppValue('core', 'lastupdatedat', 0);
+ $this->appConfig->setValueInt('core', 'lastupdatedat', 0);
// Check for code integrity if not disabled
if (\OC::$server->getIntegrityCodeChecker()->isCodeCheckEnforced()) {
@@ -325,7 +297,7 @@ class Updater extends BasicEmitter {
*/
protected function doAppUpgrade(): void {
$apps = \OC_App::getEnabledApps();
- $priorityTypes = ['authentication', 'filesystem', 'logging'];
+ $priorityTypes = ['authentication', 'extended_authentication', 'filesystem', 'logging'];
$pseudoOtherType = 'other';
$stacks = [$pseudoOtherType => []];
@@ -349,9 +321,9 @@ class Updater extends BasicEmitter {
$stack = $stacks[$type];
foreach ($stack as $appId) {
if (\OC_App::shouldUpgrade($appId)) {
- $this->emit('\OC\Updater', 'appUpgradeStarted', [$appId, \OC_App::getAppVersion($appId)]);
+ $this->emit('\OC\Updater', 'appUpgradeStarted', [$appId, \OCP\Server::get(IAppManager::class)->getAppVersion($appId)]);
\OC_App::updateApp($appId);
- $this->emit('\OC\Updater', 'appUpgrade', [$appId, \OC_App::getAppVersion($appId)]);
+ $this->emit('\OC\Updater', 'appUpgrade', [$appId, \OCP\Server::get(IAppManager::class)->getAppVersion($appId)]);
}
if ($type !== $pseudoOtherType) {
// load authentication, filesystem and logging apps after
@@ -378,7 +350,7 @@ class Updater extends BasicEmitter {
$appManager = \OC::$server->getAppManager();
foreach ($apps as $app) {
// check if the app is compatible with this version of Nextcloud
- $info = OC_App::getAppInfo($app);
+ $info = $appManager->getAppInfo($app);
if ($info === null || !OC_App::isAppCompatible($version, $info)) {
if ($appManager->isShipped($app)) {
throw new \UnexpectedValueException('The files of the app "' . $app . '" were not correctly replaced before running the update');
@@ -393,7 +365,7 @@ class Updater extends BasicEmitter {
* @return bool
*/
private function isCodeUpgrade(): bool {
- $installedVersion = $this->config->getSystemValue('version', '0.0.0');
+ $installedVersion = $this->config->getSystemValueString('version', '0.0.0');
$currentVersion = implode('.', Util::getVersion());
if (version_compare($currentVersion, $installedVersion, '>')) {
return true;
@@ -413,6 +385,13 @@ class Updater extends BasicEmitter {
if ($this->installer->isUpdateAvailable($app)) {
$this->emit('\OC\Updater', 'upgradeAppStoreApp', [$app]);
$this->installer->updateAppstoreApp($app);
+ } elseif (!empty($previousEnableStates)) {
+ /**
+ * When updating a local app we still need to run updateApp
+ * so that repair steps and migrations are correctly executed
+ * Ref: https://github.com/nextcloud/server/issues/53985
+ */
+ \OC_App::updateApp($app);
}
$this->emit('\OC\Updater', 'checkAppStoreApp', [$app]);
@@ -432,91 +411,47 @@ class Updater extends BasicEmitter {
}
}
- /**
- * Forward messages emitted by the repair routine
- */
- private function emitRepairEvents(): void {
- $dispatcher = \OC::$server->getEventDispatcher();
- $dispatcher->addListener('\OC\Repair::warning', function ($event) {
- if ($event instanceof GenericEvent) {
- $this->emit('\OC\Updater', 'repairWarning', $event->getArguments());
- }
- });
- $dispatcher->addListener('\OC\Repair::error', function ($event) {
- if ($event instanceof GenericEvent) {
- $this->emit('\OC\Updater', 'repairError', $event->getArguments());
- }
- });
- $dispatcher->addListener('\OC\Repair::info', function ($event) {
- if ($event instanceof GenericEvent) {
- $this->emit('\OC\Updater', 'repairInfo', $event->getArguments());
- }
- });
- $dispatcher->addListener('\OC\Repair::step', function ($event) {
- if ($event instanceof GenericEvent) {
- $this->emit('\OC\Updater', 'repairStep', $event->getArguments());
- }
- });
- }
-
private function logAllEvents(): void {
$log = $this->log;
- $dispatcher = \OC::$server->getEventDispatcher();
- $dispatcher->addListener('\OC\DB\Migrator::executeSql', function ($event) use ($log) {
- if (!$event instanceof GenericEvent) {
- return;
- }
- $log->info('\OC\DB\Migrator::executeSql: ' . $event->getSubject() . ' (' . $event->getArgument(0) . ' of ' . $event->getArgument(1) . ')', ['app' => 'updater']);
- });
- $dispatcher->addListener('\OC\DB\Migrator::checkTable', function ($event) use ($log) {
- if (!$event instanceof GenericEvent) {
- return;
- }
- $log->info('\OC\DB\Migrator::checkTable: ' . $event->getSubject() . ' (' . $event->getArgument(0) . ' of ' . $event->getArgument(1) . ')', ['app' => 'updater']);
- });
-
- $repairListener = function ($event) use ($log) {
- if (!$event instanceof GenericEvent) {
- return;
+ /** @var IEventDispatcher $dispatcher */
+ $dispatcher = \OC::$server->get(IEventDispatcher::class);
+ $dispatcher->addListener(
+ MigratorExecuteSqlEvent::class,
+ function (MigratorExecuteSqlEvent $event) use ($log): void {
+ $log->info(get_class($event) . ': ' . $event->getSql() . ' (' . $event->getCurrentStep() . ' of ' . $event->getMaxStep() . ')', ['app' => 'updater']);
}
- switch ($event->getSubject()) {
- case '\OC\Repair::startProgress':
- $log->info('\OC\Repair::startProgress: Starting ... ' . $event->getArgument(1) . ' (' . $event->getArgument(0) . ')', ['app' => 'updater']);
- break;
- case '\OC\Repair::advance':
- $desc = $event->getArgument(1);
- if (empty($desc)) {
- $desc = '';
- }
- $log->info('\OC\Repair::advance: ' . $desc . ' (' . $event->getArgument(0) . ')', ['app' => 'updater']);
-
- break;
- case '\OC\Repair::finishProgress':
- $log->info('\OC\Repair::finishProgress', ['app' => 'updater']);
- break;
- case '\OC\Repair::step':
- $log->info('\OC\Repair::step: Repair step: ' . $event->getArgument(0), ['app' => 'updater']);
- break;
- case '\OC\Repair::info':
- $log->info('\OC\Repair::info: Repair info: ' . $event->getArgument(0), ['app' => 'updater']);
- break;
- case '\OC\Repair::warning':
- $log->warning('\OC\Repair::warning: Repair warning: ' . $event->getArgument(0), ['app' => 'updater']);
- break;
- case '\OC\Repair::error':
- $log->error('\OC\Repair::error: Repair error: ' . $event->getArgument(0), ['app' => 'updater']);
- break;
+ );
+
+ $repairListener = function (Event $event) use ($log): void {
+ if ($event instanceof RepairStartEvent) {
+ $log->info(get_class($event) . ': Starting ... ' . $event->getMaxStep() . ' (' . $event->getCurrentStepName() . ')', ['app' => 'updater']);
+ } elseif ($event instanceof RepairAdvanceEvent) {
+ $desc = $event->getDescription();
+ if (empty($desc)) {
+ $desc = '';
+ }
+ $log->info(get_class($event) . ': ' . $desc . ' (' . $event->getIncrement() . ')', ['app' => 'updater']);
+ } elseif ($event instanceof RepairFinishEvent) {
+ $log->info(get_class($event), ['app' => 'updater']);
+ } elseif ($event instanceof RepairStepEvent) {
+ $log->info(get_class($event) . ': Repair step: ' . $event->getStepName(), ['app' => 'updater']);
+ } elseif ($event instanceof RepairInfoEvent) {
+ $log->info(get_class($event) . ': Repair info: ' . $event->getMessage(), ['app' => 'updater']);
+ } elseif ($event instanceof RepairWarningEvent) {
+ $log->warning(get_class($event) . ': Repair warning: ' . $event->getMessage(), ['app' => 'updater']);
+ } elseif ($event instanceof RepairErrorEvent) {
+ $log->error(get_class($event) . ': Repair error: ' . $event->getMessage(), ['app' => 'updater']);
}
};
- $dispatcher->addListener('\OC\Repair::startProgress', $repairListener);
- $dispatcher->addListener('\OC\Repair::advance', $repairListener);
- $dispatcher->addListener('\OC\Repair::finishProgress', $repairListener);
- $dispatcher->addListener('\OC\Repair::step', $repairListener);
- $dispatcher->addListener('\OC\Repair::info', $repairListener);
- $dispatcher->addListener('\OC\Repair::warning', $repairListener);
- $dispatcher->addListener('\OC\Repair::error', $repairListener);
+ $dispatcher->addListener(RepairStartEvent::class, $repairListener);
+ $dispatcher->addListener(RepairAdvanceEvent::class, $repairListener);
+ $dispatcher->addListener(RepairFinishEvent::class, $repairListener);
+ $dispatcher->addListener(RepairStepEvent::class, $repairListener);
+ $dispatcher->addListener(RepairInfoEvent::class, $repairListener);
+ $dispatcher->addListener(RepairWarningEvent::class, $repairListener);
+ $dispatcher->addListener(RepairErrorEvent::class, $repairListener);
$this->listen('\OC\Updater', 'maintenanceEnabled', function () use ($log) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-15 08:08:25 +0000