Fix for app:enable in case of not valid/not existing enterprise key

owncloud · Nov 11, 2019 · b3353dd · b3353dd
1 parent 5503eb7
commit b3353dd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/core/Command/App/Enable.php b/core/Command/App/Enable.php
@@ -24,6 +24,7 @@
 
 namespace OC\Core\Command\App;
 
+use OCP\IConfig;
 use OCP\App\IAppManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -36,12 +37,17 @@ class Enable extends Command {
 	/** @var IAppManager */
 	protected $manager;
 
+	/** @var IConfig */
+	protected $config;
+
 	/**
 	 * @param IAppManager $manager
+	 * @param IConfig $config
 	 */
-	public function __construct(IAppManager $manager) {
+	public function __construct(IAppManager $manager, IConfig $config) {
 		parent::__construct();
 		$this->manager = $manager;
+		$this->config = $config;
 	}
 
 	protected function configure() {
@@ -71,10 +77,21 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 		}
 
 		$groups = $input->getOption('groups');
+		if (\OC_App::isEnabled('enterprise_key')) {
+			$key = new \OCA\Enterprise_Key\EnterpriseKey(false, $this->config);
+		}
 		if (empty($groups)) {
+			if ($key && !$key->isValid()) {
+				$output->writeln($appId . ' cannot be enabled because of invalid enteprise key');
+				return 1;
+			}
 			\OC_App::enable($appId);
 			$output->writeln($appId . ' enabled');
 		} else {
+			if ($key && !$key->isValid()) {
+				$output->writeln($appId . ' cannot be enabled because of invalid enteprise key');
+				return 1;
+			}
 			\OC_App::enable($appId, $groups);
 			$output->writeln($appId . ' enabled for groups: ' . \implode(', ', $groups));
 		}

diff --git a/core/register_command.php b/core/register_command.php
@@ -59,7 +59,7 @@
 
 if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
 	$application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
-	$application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager()));
+	$application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager(), \OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\App\GetPath());
 	$application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));