From bcc9d07c1772a45567b7554fba80e84dc09b9e51 Mon Sep 17 00:00:00 2001 From: Git'Fellow <12234510+solracsf@users.noreply.github.com> Date: Fri, 6 Dec 2024 19:25:32 +0100 Subject: feat(occ): Better handling of disabled or unreacheable App store Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> --- core/Command/App/Update.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/core/Command/App/Update.php b/core/Command/App/Update.php index b2d02e222de..259c26013f7 100644 --- a/core/Command/App/Update.php +++ b/core/Command/App/Update.php @@ -10,6 +10,7 @@ namespace OC\Core\Command\App; use OC\Installer; use OCP\App\IAppManager; +use OCP\IConfig; use Psr\Log\LoggerInterface; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; @@ -18,8 +19,11 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class Update extends Command { + public const APP_STORE_URL = 'https://apps.nextcloud.com/api/v1'; + public function __construct( protected IAppManager $manager, + protected IConfig $config, private Installer $installer, private LoggerInterface $logger, ) { @@ -57,6 +61,19 @@ class Update extends Command { } protected function execute(InputInterface $input, OutputInterface $output): int { + $appStoreEnabled = $this->config->getSystemValueBool('appstoreenabled', true); + if ($appStoreEnabled === false) { + $output->writeln('App store access is disabled'); + return 1; + } + + $internetAvailable = $this->config->getSystemValueBool('has_internet_connection', true); + $isDefaultAppStore = $this->config->getSystemValueString('appstoreurl', self::APP_STORE_URL) === self::APP_STORE_URL; + if ($internetAvailable === false && $isDefaultAppStore === true) { + $output->writeln('Internet connection is disabled, and therefore the default public App store is not reachable'); + return 1; + } + $singleAppId = $input->getArgument('app-id'); $updateFound = false; -- cgit v1.2.3