diff --git a/core/Command/Integrity/CheckApp.php b/core/Command/Integrity/CheckApp.php
index d24b80a4764e6..ce658ec16dabb 100644
--- a/core/Command/Integrity/CheckApp.php
+++ b/core/Command/Integrity/CheckApp.php
@@ -9,6 +9,8 @@
use OC\Core\Command\Base;
use OC\IntegrityCheck\Checker;
+use OC\IntegrityCheck\Helpers\AppLocator;
+use OC\IntegrityCheck\Helpers\FileAccessHelper;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
@@ -22,6 +24,8 @@
class CheckApp extends Base {
public function __construct(
private Checker $checker,
+ private AppLocator $appLocator,
+ private FileAccessHelper $fileAccessHelper,
) {
parent::__construct();
}
@@ -43,14 +47,19 @@ protected function configure() {
*/
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('' . count($result) . ' errors found', OutputInterface::VERBOSITY_VERBOSE);
- return 1;
+ $path = (string)$input->getOption('path') ?? $this->appLocator->getAppPath($appid);
+ if ($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('' . count($result) . ' errors found', OutputInterface::VERBOSITY_VERBOSE);
+ return 1;
+ }
+ $output->writeln('No errors found', OutputInterface::VERBOSITY_VERBOSE);
+ } else {
+ $output->writeln('App signature not found, skipping app integrity check', OutputInterface::VERBOSITY_VERBOSE);
}
- $output->writeln('No errors found', OutputInterface::VERBOSITY_VERBOSE);
return 0;
}
}