Merge pull request #741 from nextcloud/fix/740/broken-url-flag

Author: skjnldsv

index.php

@@ -580,7 +580,6 @@ private function getUpdateServerResponse(): array {
 		$this->silentLog('[info] updateURL: ' . $updateURL);
 
 		$maxRetries = 2;
-		$lastException = null;
 
 		for ($attempt = 1; $attempt <= $maxRetries; $attempt++) {
 			try {
@@ -872,14 +871,19 @@ private function getDownloadedFilePath(): string {
 	 *
 	 * @throws \Exception
 	 */
-	public function verifyIntegrity(): void {
+	public function verifyIntegrity(string $urlOverride = ''): 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

@@ -463,7 +463,7 @@ protected function executeStep(int $step, OutputInterface $output): array {
 						$this->updater->silentLog('[info] Skipping integrity check as requested');
 						break;
 					}
-					$this->updater->verifyIntegrity();
+					$this->updater->verifyIntegrity($this->urlOverride);
 					break;
 				case 6:
 					$this->updater->extractDownload();

lib/Updater.php

@@ -564,7 +564,6 @@ private function getUpdateServerResponse(): array {
 		$this->silentLog('[info] updateURL: ' . $updateURL);
 
 		$maxRetries = 2;
-		$lastException = null;
 
 		for ($attempt = 1; $attempt <= $maxRetries; $attempt++) {
 			try {
@@ -856,14 +855,19 @@ private function getDownloadedFilePath(): string {
 	 *
 	 * @throws \Exception
 	 */
-	public function verifyIntegrity(): void {
+	public function verifyIntegrity(string $urlOverride = ''): 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');

tests/features/bootstrap/FeatureContext.php

@@ -614,4 +614,3 @@ public function theUpdateServerIsUnreachable() {
 		// Intentionally do NOT start any server on port 8871
 	}
 }
-