Merge pull request #49577 from ehfd/17801

fix(occ): `occ integrity:check-app` and Admin panel "rescan" deliver inconsistent results

core/Command/Integrity/CheckApp.php

@@ -9,6 +9,9 @@
 
 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 @@
 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 @@ 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('<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;
 	}
 }