From 977f44428d87a3dfa836d63e6bed559305573ef9 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 16 Apr 2026 22:41:37 +0200 Subject: [PATCH] fix: broken upgrade via --url flag Signed-off-by: Arthur Schiwon --- index.php | 7 ++++++- lib/UpdateCommand.php | 2 +- lib/Updater.php | 7 ++++++- updater.phar | Bin 1174796 -> 1174962 bytes 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index 2743ff75..80c8281b 100644 --- a/index.php +++ b/index.php @@ -758,7 +758,7 @@ private function getDownloadedFilePath(): string { * * @throws \Exception */ - public function verifyIntegrity(): void { + public function verifyIntegrity(string $urlOverride = ''): void { $this->silentLog('[info] verifyIntegrity()'); if ($this->getCurrentReleaseChannel() === 'daily') { @@ -766,6 +766,11 @@ public function verifyIntegrity(): void { 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'); diff --git a/lib/UpdateCommand.php b/lib/UpdateCommand.php index 5fecddfc..efb78842 100644 --- a/lib/UpdateCommand.php +++ b/lib/UpdateCommand.php @@ -385,7 +385,7 @@ protected function executeStep(int $step): 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(); diff --git a/lib/Updater.php b/lib/Updater.php index be40d1ab..b1d051a6 100644 --- a/lib/Updater.php +++ b/lib/Updater.php @@ -720,7 +720,7 @@ private function getDownloadedFilePath(): string { * * @throws \Exception */ - public function verifyIntegrity(): void { + public function verifyIntegrity(string $urlOverride = ''): void { $this->silentLog('[info] verifyIntegrity()'); if ($this->getCurrentReleaseChannel() === 'daily') { @@ -728,6 +728,11 @@ public function verifyIntegrity(): void { 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'); diff --git a/updater.phar b/updater.phar index ebf723477fc4303fb6dbf58efeeccf4984aa5364..2d2090ba5e7267efddacbccbfb8bf3242aea58dd 100755 GIT binary patch delta 4365 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 VBNlaA2DTI`{LyY@GRIFF|3BCi{F@DTu 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