upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #49577 from ehfd/17801

Browse source 
fix(occ): `occ integrity:check-app` and Admin panel "rescan" deliver inconsistent results
This commit is contained in:
Joas Schilling 2024-12-18 09:19:06 +01:00 committed by GitHub
commit 5198ef2150
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/Command/Integrity/CheckApp.php
View file

@ -9,6 +9,9 @@ namespace OC\Core\Command\Integrity;
use OC\Core\Command\Base;
use OC\IntegrityCheck\Checker;
use OC\IntegrityCheck\Helpers\AppLocator;
use OC\IntegrityCheck\Helpers\FileAccessHelper;
use OCP\App\IAppManager;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
@ -22,6 +25,9 @@ use Symfony\Component\Console\Output\OutputInterface;
class CheckApp extends Base {
public function __construct(
private Checker $checker,
private AppLocator $appLocator,
private FileAccessHelper $fileAccessHelper,
private IAppManager $appManager,
) {
parent::__construct();
}
@ -44,13 +50,21 @@ 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, true);
$this->writeArrayInOutputFormat($input, $output, $result);
if (count($result) > 0) {
$output->writeln('<error>' . count($result) . ' errors found</error>', OutputInterface::VERBOSITY_VERBOSE);
return 1;
if ($path === '') {
$path = $this->appLocator->getAppPath($appid);
}
if ($this->appManager->isShipped($appid) || $this->fileAccessHelper->file_exists($path . '/appinfo/signature.json')) {
// Only verify if the application explicitly ships a signature.json file
$result = $this->checker->verifyAppSignature($appid, $path, true);
$this->writeArrayInOutputFormat($input, $output, $result);
if (count($result) > 0) {
$output->writeln('<error>' . count($result) . ' errors found</error>', OutputInterface::VERBOSITY_VERBOSE);
return 1;
}
$output->writeln('<info>No errors found</info>', OutputInterface::VERBOSITY_VERBOSE);
} else {
$output->writeln('<comment>App signature not found, skipping app integrity check</comment>');
}
$output->writeln('<info>No errors found</info>', OutputInterface::VERBOSITY_VERBOSE);
return 0;
}
}