Merge pull request #724 from nextcloud/backport/723/stable33

[stable33] fix: verify integrity with URL override but allow to disable if needed

Author: susnux

README.md

@@ -239,7 +239,7 @@ Keep in mind that for the update/upgrade process there are some additional compo
 	- Handles database upgrade migrations
 	- Handles app updates (i.e. for compatibility with a new major version of Server)
 
-### Dependences needed for building
+### Dependencies needed for building
 
 #### box
 

index.php

@@ -830,19 +830,14 @@ private function getDownloadedFilePath(): string {
 	 *
 	 * @throws \Exception
 	 */
-	public function verifyIntegrity(string $urlOverride = ''): void {
+	public function verifyIntegrity(): void {
 		$this->silentLog('[info] verifyIntegrity()');
 
 		if ($this->getCurrentReleaseChannel() === 'daily') {
 			$this->silentLog('[info] current channel is "daily" which is not signed. Skipping verification.');
 			return;
 		}
 
-		if ($urlOverride !== '') {
-			$this->silentLog('[info] custom download url provided, cannot verify signature');
-			return;
-		}
-
 		$response = $this->getUpdateServerResponse();
 		if (empty($response['signature'])) {
 			throw new \Exception('No signature specified for defined update');

lib/UpdateCommand.php

@@ -28,6 +28,8 @@ class UpdateCommand extends Command {
 
 	protected bool $ignoreState = false;
 
+	protected bool $skipIntegrityCheck = false;
+
 	protected string $urlOverride = '';
 
 	/** Strings of text for stages of updater */
@@ -57,6 +59,7 @@ protected function configure(): void {
 			->addOption('no-upgrade', null, InputOption::VALUE_NONE, "Don't automatically run occ upgrade")
 			->addOption('url', null, InputOption::VALUE_OPTIONAL, 'The URL of the Nextcloud release to download')
 			->addOption('ignore-state', null, InputOption::VALUE_NONE, 'Ignore known state from .step file, do a complete update')
+			->addOption('no-verify', null, InputOption::VALUE_OPTIONAL, 'Skip integrity verification of the downloaded file')
 		;
 	}
 
@@ -73,6 +76,7 @@ public static function getUpdaterVersion(): string {
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$this->skipBackup = (bool)$input->getOption('no-backup');
 		$this->skipUpgrade = (bool)$input->getOption('no-upgrade');
+		$this->skipIntegrityCheck = (bool)$input->getOption('no-verify');
 		$this->urlOverride = (string)$input->getOption('url');
 		$this->ignoreState = (bool)$input->getOption('ignore-state');
 
@@ -166,6 +170,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$updateString = $this->updater->checkForUpdate();
 		}
 
+		if ($this->skipIntegrityCheck) {
+			$this->updater->log('[warn] Integrity check of the downloaded file will be skipped');
+			$output->writeln('Integrity check of the downloaded file will be skipped.');
+		}
+
 		$output->writeln('');
 
 		$lines = explode('<br />', $updateString);
@@ -450,7 +459,11 @@ protected function executeStep(int $step, OutputInterface $output): array {
 					});
 					break;
 				case 5:
-					$this->updater->verifyIntegrity($this->urlOverride);
+					if ($this->skipIntegrityCheck) {
+						$this->updater->silentLog('[info] Skipping integrity check as requested');
+						break;
+					}
+					$this->updater->verifyIntegrity();
 					break;
 				case 6:
 					$this->updater->extractDownload();

lib/Updater.php

@@ -814,19 +814,14 @@ private function getDownloadedFilePath(): string {
 	 *
 	 * @throws \Exception
 	 */
-	public function verifyIntegrity(string $urlOverride = ''): void {
+	public function verifyIntegrity(): void {
 		$this->silentLog('[info] verifyIntegrity()');
 
 		if ($this->getCurrentReleaseChannel() === 'daily') {
 			$this->silentLog('[info] current channel is "daily" which is not signed. Skipping verification.');
 			return;
 		}
 
-		if ($urlOverride !== '') {
-			$this->silentLog('[info] custom download url provided, cannot verify signature');
-			return;
-		}
-
 		$response = $this->getUpdateServerResponse();
 		if (empty($response['signature'])) {
 			throw new \Exception('No signature specified for defined update');