diff options
| -rw-r--r-- | core/Command/Integrity/CheckApp.php | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/core/Command/Integrity/CheckApp.php b/core/Command/Integrity/CheckApp.php index d24b80a4764..e1889a35cfe 100644 --- a/core/Command/Integrity/CheckApp.php +++ b/core/Command/Integrity/CheckApp.php @@ -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; } } |