diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2021-01-19 11:35:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 11:35:52 +0300 |
| commit | 0893bba369aba50bca7b9bba09b7e8be7a8a7f61 (patch) | |
| tree | 40b3ad5a42cbf5df217f8e93a3cdef1707cd5e2c /core | |
| parent | 91864aeb40b0ebd61ac6f57fe49f477f885c3808 (diff) | |
| parent | 7ef7c3e3f2729c2518ff62fbac063f63be429160 (diff) | |
Merge pull request #25153 from nextcloud/bugfix/noid/force-signature-verification-on-occ
Force signature verification of apps on occ
Diffstat (limited to 'core')
| -rw-r--r-- | core/Command/Integrity/CheckApp.php | 2 | ||||
| -rw-r--r-- | core/Command/Integrity/CheckCore.php | 5 | ||||
| -rw-r--r-- | core/Command/Upgrade.php | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/core/Command/Integrity/CheckApp.php b/core/Command/Integrity/CheckApp.php index 7bf92001cc8..b95d879941e 100644 --- a/core/Command/Integrity/CheckApp.php +++ b/core/Command/Integrity/CheckApp.php @@ -70,7 +70,7 @@ class CheckApp extends Base { protected function execute(InputInterface $input, OutputInterface $output): int { $appid = $input->getArgument('appid'); $path = (string)$input->getOption('path'); - $result = $this->checker->verifyAppSignature($appid, $path); + $result = $this->checker->verifyAppSignature($appid, $path, true); $this->writeArrayInOutputFormat($input, $output, $result); if (count($result) > 0) { return 1; diff --git a/core/Command/Integrity/CheckCore.php b/core/Command/Integrity/CheckCore.php index 6f319abdf74..cca72535f36 100644 --- a/core/Command/Integrity/CheckCore.php +++ b/core/Command/Integrity/CheckCore.php @@ -61,6 +61,11 @@ class CheckCore extends Base { * {@inheritdoc } */ protected function execute(InputInterface $input, OutputInterface $output): int { + if (!$this->checker->isCodeCheckEnforced()) { + $output->writeln('<comment>integrity:check-core can not be used on git checkouts</comment>'); + return 2; + } + $result = $this->checker->verifyCoreSignature(); $this->writeArrayInOutputFormat($input, $output, $result); if (count($result) > 0) { diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php index b5361382190..7ab5fe8e5fd 100644 --- a/core/Command/Upgrade.php +++ b/core/Command/Upgrade.php @@ -263,7 +263,7 @@ class Upgrade extends Command { return self::ERROR_SUCCESS; } elseif ($this->config->getSystemValueBool('maintenance')) { //Possible scenario: Nextcloud core is updated but an app failed - $output->writeln('<warning>Nextcloud is in maintenance mode</warning>'); + $output->writeln('<comment>Nextcloud is in maintenance mode</comment>'); $output->write('<comment>Maybe an upgrade is already in process. Please check the ' . 'logfile (data/nextcloud.log). If you want to re-run the ' . 'upgrade procedure, remove the "maintenance mode" from ' |