Merge pull request #754 from nextcloud/fix/file-url-download

fix: allow file:// URLs with --url option

Author: skjnldsv

index.php

@@ -784,7 +784,8 @@ private function downloadArchive(string $fromUrl, string $toLocation): bool {
 		}
 
 		$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-		if ($httpCode !== 200 && $httpCode !== 206) {
+		$isFileUrl = parse_url($fromUrl, PHP_URL_SCHEME) === 'file';
+		if (!$isFileUrl && $httpCode !== 200 && $httpCode !== 206) {
 			fclose($fp);
 			unlink($toLocation);
 			$this->silentLog('[warn] fail to download archive from ' . $fromUrl . '. Error: ' . $httpCode . ' ' . curl_error($ch));

lib/Updater.php

@@ -768,7 +768,8 @@ private function downloadArchive(string $fromUrl, string $toLocation): bool {
 		}
 
 		$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-		if ($httpCode !== 200 && $httpCode !== 206) {
+		$isFileUrl = parse_url($fromUrl, PHP_URL_SCHEME) === 'file';
+		if (!$isFileUrl && $httpCode !== 200 && $httpCode !== 206) {
 			fclose($fp);
 			unlink($toLocation);
 			$this->silentLog('[warn] fail to download archive from ' . $fromUrl . '. Error: ' . $httpCode . ' ' . curl_error($ch));

tests/features/bootstrap/FeatureContext.php

@@ -212,6 +212,84 @@ public function theCliUpdaterIsRun() {
 		$this->CLIReturnCode = $returnCode;
 	}
 
+	/**
+	 * @Given the archive for version :version is available locally
+	 */
+	public function theArchiveForVersionIsAvailableLocally(string $version): void {
+		if ($this->skipIt) {
+			return;
+		}
+
+		$filename = 'nextcloud-' . $version . '.zip';
+		if (!file_exists($this->tmpDownloadDir . $filename)) {
+			$fp = fopen($this->tmpDownloadDir . $filename, 'w+');
+			$url = $this->downloadURL . $filename;
+			$ch = curl_init($url);
+			curl_setopt($ch, CURLOPT_FILE, $fp);
+			curl_setopt($ch, CURLOPT_USERAGENT, 'Nextcloud Updater');
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+			if (curl_exec($ch) === false) {
+				throw new \Exception('Curl error: ' . curl_error($ch));
+			}
+			$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+			if ($httpCode !== 200) {
+				throw new \Exception('Download failed for ' . $url . ' - HTTP code: ' . $httpCode);
+			}
+			curl_close($ch);
+			fclose($fp);
+		}
+	}
+
+	/**
+	 * @When the CLI updater is run with local file URL for version :version and --no-verify successfully
+	 */
+	public function theCliUpdaterIsRunWithLocalFileUrlAndNoVerifySuccessfully(string $version): void {
+		if ($this->skipIt) {
+			return;
+		}
+
+		$this->runUpdaterWithLocalFileUrl($version, noVerify: true);
+
+		if ($this->CLIReturnCode !== 0) {
+			throw new Exception('updater failed' . PHP_EOL . implode(PHP_EOL, $this->CLIOutput));
+		}
+	}
+
+	/**
+	 * @When the CLI updater is run with local file URL for version :version
+	 */
+	public function theCliUpdaterIsRunWithLocalFileUrl(string $version): void {
+		if ($this->skipIt) {
+			return;
+		}
+
+		$this->runUpdaterWithLocalFileUrl($version, noVerify: false);
+	}
+
+	private function runUpdaterWithLocalFileUrl(string $version, bool $noVerify): void {
+		$filename = 'nextcloud-' . $version . '.zip';
+		$fileUrl = 'file://' . $this->tmpDownloadDir . $filename;
+
+		if (!file_exists($this->buildDir . 'updater.phar')) {
+			throw new Exception('updater.phar not available - please build it in advance via "box build -c box.json"');
+		}
+
+		copy($this->buildDir . 'updater.phar', $this->serverDir . 'nextcloud/updater/updater');
+		chdir($this->serverDir . 'nextcloud/updater');
+		chmod($this->serverDir . 'nextcloud/updater/updater', 0755);
+
+		$args = '-n --url ' . escapeshellarg($fileUrl);
+		if ($noVerify) {
+			$args .= ' --no-verify';
+		}
+		exec('./updater ' . $args . ' 2>&1', $output, $returnCode);
+
+		// sleep to let the opcache do it's work and invalidate the status.php
+		sleep(5);
+		$this->CLIOutput = $output;
+		$this->CLIReturnCode = $returnCode;
+	}
+
 	/**
 	 * @param $version
 	 */

tests/features/cli.feature

@@ -114,3 +114,21 @@ Feature: CLI updater
     And the installed version should be 26.0.0
     And maintenance mode should be off
     And upgrade is not required
+
+  Scenario: Update via local file URL with --no-verify - 26.0.0 to 26.0.13
+    Given the current installed version is 26.0.0
+    And the archive for version 26.0.13 is available locally
+    When the CLI updater is run with local file URL for version 26.0.13 and --no-verify successfully
+    Then the installed version should be 26.0.1
+    And maintenance mode should be off
+    And upgrade is not required
+
+  Scenario: Update via local file URL without --no-verify fails - 26.0.0 to 26.0.13
+    Given the current installed version is 26.0.0
+    And the archive for version 26.0.13 is available locally
+    When the CLI updater is run with local file URL for version 26.0.13
+    Then the return code should not be 0
+    And the output should contain "You need to provide a signature with --signature or skip integrity check with --no-verify."
+    And the installed version should be 26.0.0
+    And maintenance mode should be off
+    And upgrade is not required

updater.phar

@@ -17,11 +17,11 @@
     },
     "require-dev": {
         "ext-json": "*",
-        "composer/composer": "^2.0",
+        "composer/composer": "^2.2.26",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.8",
-        "phpstan/phpstan-phpunit": "^1.1",
-        "phpunit/phpunit": "^8.5 || ^9.5",
+        "phpstan/phpstan": "^1.8 || ^2.0",
+        "phpstan/phpstan-phpunit": "^1.1 || ^2.0",
+        "phpunit/phpunit": "^8.5 || ^9.6 || ^10.0",
         "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
         "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
         "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0"
@@ -38,9 +38,9 @@
     },
     "config": {
         "allow-plugins": {
-            "phpstan/extension-installer": true,
             "ergebnis/composer-normalize": true,
-            "infection/extension-installer": true
+            "infection/extension-installer": true,
+            "phpstan/extension-installer": true
         },
         "sort-packages": true
     },