Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable26] fix: Correctly check result of function #561

Merged
merged 1 commit into from
May 23, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented May 22, 2024

Backport of #556

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot requested review from blizzz and nickvergessen May 22, 2024 15:24
@blizzz blizzz force-pushed the backport/556/stable26 branch from 4ff7f6e to 58363a4 Compare May 22, 2024 15:55
@blizzz blizzz marked this pull request as ready for review May 22, 2024 15:56
@blizzz blizzz requested review from Altahrim and skjnldsv May 22, 2024 15:56
@blizzz
Copy link
Member

blizzz commented May 22, 2024

phar got updated:

$ grep -A6 -a openssl_verify updater.phar 
                $validSignature = openssl_verify(
                        file_get_contents($this->getDownloadedFilePath()),
                        base64_decode($response['signature']),
                        $certificate,
                        OPENSSL_ALGO_SHA512
                ) === 1;

@blizzz blizzz force-pushed the backport/556/stable26 branch from 58363a4 to 6095a8e Compare May 22, 2024 16:02
@blizzz
Copy link
Member

blizzz commented May 22, 2024

P.S.: i was irritated about the 6 bytes difference. It is dropping " dirty" from the version, which is applied automatically when the updater.phar is built while the git repo is not clean (e.g. due to new hashes in vendor/composer/installed.php if you don't pay attention)

@blizzz blizzz force-pushed the backport/556/stable26 branch from 6095a8e to 4d0f1e9 Compare May 22, 2024 16:06
@blizzz blizzz force-pushed the backport/556/stable26 branch from 4d0f1e9 to b4d5139 Compare May 23, 2024 08:41
@blizzz
Copy link
Member

blizzz commented May 23, 2024

master is expected to fail

@blizzz blizzz merged commit 75ee915 into stable26 May 23, 2024
17 of 21 checks passed
@blizzz blizzz deleted the backport/556/stable26 branch May 23, 2024 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants