From 6097fab7d4607eb10ec862f06ae8f3412da4964b 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 1178245 -> 1178414 bytes 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index c34fc5c6..4ef249bf 100644 --- a/index.php +++ b/index.php @@ -766,7 +766,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') { @@ -774,6 +774,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 c7a26e26..0596418c 100644 --- a/lib/UpdateCommand.php +++ b/lib/UpdateCommand.php @@ -420,7 +420,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 83b60513..e2b96721 100644 --- a/lib/Updater.php +++ b/lib/Updater.php @@ -749,7 +749,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') { @@ -757,6 +757,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 f6a1f75c7e1d6cad8dcbe9be8f00edb761618468..af7d0dadacf394c694ffd426dfe4b85aba163d2d 100755 GIT binary patch delta 3064 zcmZWrdr(x@89zLhyU%-fm&fk12p4vNWr39y7Iu+kMN~jRQStp&R^5nz2*%i$XllwN z+CcZ1+{7lqjI~CrRwfp$CPtlUY#x>*#F(h#gQT%0);6Kkm}a!+e&3oICx4vz%{kxi zeBXDz*S$}VR2}+nRd$s_w5Qcki(`$q|Egj<;1>!%SZXLEJlv63u{nYb6f?m_DmzB>YAo|#THBB5EC4ua>I#yL;DsHJ{Y25nZV=~<;2 z1iu?k$c^)_en8#M2RGEzq)G<0MXEX=wMG%LeW>6)*=|^Eka~4O3b%zF%89tFng(Q- zx&bu`giLz>eqGpY4Qq{3cZp!2AE*t$xu%{C=+jIG{I#YQ@UmtepjTTDxLsQVctJY} zP}EfcKB7b3JGv#XcksC1#xDTd%T$DX_4v>mv_fm8f7Gg^!(F^Wnzn~m(^MfrBPVzu znvh$0f2C2Dl%Fxw8o3nCGlu-IUkU5L$PYpgaJhah;K%wkfa45H!01jEi01~*WtCV&&al$Y zA@`ltiq&XIcIHxw7j%D`p!#m6!s;tBEtfEMaE* z+C5XT>O>`7nk0f?A$!`*bYnYp^Q^d-;8dbYTKEMoaz|qE(N~i&!46Y3+^Ay`?@ z%w$xuHW|zI?d0ijNo2j1l(ggyzR5(R*aVYE!_K#^e)&gQZum`kkj3pE{Fn68Orewj$d1{e)Ma0_4 zPsbX`sA1U-ZhBdcptQvzsOcZljrfjqOq7s;{+n5rD+b!CFSX8;an;<(Do!hAfQH5+X1 zm8k>Oa!za#hZCD(lM_?>t`k$+t{|lJ#DXj~ zlWbD`+q_O%c#`M2i|kmQluL6lK8JJh+Wp9WS|0XRua%IkcZ+_(zCKo}cd4b_CwP_A z&9P!S$4XgNF`S1Xug=GWb!rINwkFdDpSlNE===HT=dFDF38-~pF?74IH7~pH8#I-b z_~6|^haCU#=uwuM=GKmOdA6%Xe7%fS^Y(e=dI*n>mqz#VoOHFHAH|)DMDnZA^C2OX z1y}!{!F zJhw}(9%;!vUMXGf<1L&&GG=lLu~{B1tON(%itIH-cwPPp_;go~m9<&Cbmn_DS$7l} zfVsN}zn;TII3KG#1#rH}Qw;cq2Z#Q5o^se17LNs7SB%5|Pz1k;oadC_C}=7{{=pJ2 z@c&U_*EbRjq>PU>-D{#LUaS789z2xsc4u%Bt@5Vp2gl)|jJJoM{*Z3;;!n$7FS_@c zHy_k0ec0i%eE9I+`mifUeAtyUOR+>=FU5F%SBk$-Q`orQz4x^M-8$Audy18u{5_Iu zYU5ZOo5#oEWPG0a+I}hh0$uD&r}`2V6^pf8UgYyzUFHEVwv^%T+^I4*?Eh2df_xui z6D4!@Geh)4ebnzkX>))s0Eis^p8n4K*JR_jI2ijMW|Eo;Tb zmPebLT9!46j3>6XwQOL##yoMwvgYQNc9C5St$a*eA6nJCti7Wxc(fr;Z`&+=w2hgl v>eU-NyY}mkcI`J@tWW8`wSIGG-@Y&7X6$Npuij}5r*v|xJxJB~y7B)9gnruv delta 2984 zcmZWreN>az8NYmlH+hr1ZxRAY2p@q23;{wC2qZxG@GGEzsQ9hGYSB@v#T7RX(^k87 zo~o;iTl;R#iapk?#c5@A;)N%Oj9I!K*?pfU_8d?DxaW87 zz0Z90qbXSBTUlIK+`6iDRngB66+F2A$Givjv^r`pgS$1Vm6iJJ{7XK^z@ zcm;Fi%#&BUXkRp_qywA_1U};yfPlhB$lZ!1W?FARfpyAsxY*4!E_&)08X8h%&~-|l zo>iLR;^nD?+`72$JoUQnzu>7!l>}-FRdpcL9!1EGQO|p_-ELkl^=idrZVNk<3vo>~ z2ZY^xBWe^0nR#xquG?$v))=I&Vo^`e^LmgO;THl1)pG%Vrmh9Nrd|RV&@=$<(9{54 z(#!<3X~TezXi@GRZ8Pkh0`8v{mVxc>sR;RG)9CB8N@Jz3X;jkDU4lZIb3ou}s%TWp z1s;kf__1uvqFWq?&iEI^mB1ojto!iWZrhhpFd37HOa_qr-KQ}aCswP9+)M} zY+r}J9$9Bo(w0OUTr6jy-A*@jP_Mwq#V!UDRMPT~1siuP7K6T#hy`|e_56Pxd1gceTHIYce+ArOzgHd&FBz1C{bG;T#rp=3-$8`Cgu z`sF|AJ!`f!lqM>qJs%1@w<8IkUrELg*Xjv5JUp3)l;nSAbSc53^IXn*Z-nfza#OFI(cd7Ey1Wef>X0iM$>WEL)~6G zWtUXt%m58;=X@~n1-qa7-s;kCd+MkYd#aaR%&)86MVn(lwd4^*2d9Wc;>tz`2AI?r z8*FVb2<6U`9Z1!RiMm(WjXVcs9DQ``1k0O~axQEVrwf~+(}ksd*M+6+P!LjbYFQSW zNp`8>EkP?S9}ooY3Okl3WlIj`=V%T-n~dz|!$b z$H;VnQCU_omWwH`&clLjQxo#^n#>@4>h3?G=kn0c&-3snpw^9K=yGFgUUTC&sGd=L zcw*Qo=f68Y#Zt4beM5&l+j$#CFJpMgZvrwOy7S|u{Nn;A-8e3!aD$Odev-cw3Np=u z9N6o@&;MP|Vkl4@W9ot95Bq7Y$0fBL6VkZe$jd`sbmp!XySK`RxWk9z$;mqE*Uw+r zBeO?pz9%T9Ykh)+3q{6Eb^$iaj|!%N18+w5>Oy=j{{(!vr^m|LEM7YE6`QO(3-utm zzYxEkV}&>$!+sB(clwI}U-#qCzvC~5eL+zv;QAsQ{zoGCS>!ys7)QaQ#VCKcH~{jW z7CUsS2_{m;hK_`OnjEm|KHZ0hGJ5J?PNCsIy6$u(9?IA`b8i;i7{H&Fg8_8!qd*?0 zRR*!c7X&fzUj?x%$Aj3F^GlE-uasau@08##)ND5H_aA(zf^IE!(VikDCx4G*PHim3 zv3ar-C*yABYsb~}OSCDNPIbj9YAe!kxslIrb(tT$*iweSbAx4G*#D=@4fQ_3CQ9bQ zXGiH@LJ5+;UT@*fM807wLntYQFpje!Osk?C&x7Td-XE4bLE}s1DEHTLOsA$IAI{4w z95Vi-wPIUqMHE}nY{jq@%a($zIJP*plx(Tk;@MKOrD03UmeAi?A@+1@f3VV<=gV8| zFY@_(fqvnA@v$XR)$ephX>d~1ODA)5Z}&&#>9m`-*?M*TwqE_6hUDnoHILsa+cfaU XXI|4!q%?lH{qoQiMrRV9S~vCo*%9vF