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

[stable24] fix: Correctly check result of function #563

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.

Signed-off-by: Joas Schilling <coding@schilljs.com>
@blizzz blizzz force-pushed the backport/556/stable24 branch from 0ace2d1 to 77180c2 Compare May 23, 2024 12:56
@blizzz blizzz requested review from Altahrim and skjnldsv May 23, 2024 12:58
@blizzz blizzz marked this pull request as ready for review May 23, 2024 12:58
@blizzz
Copy link
Member

blizzz commented May 23, 2024

we don't have tests for 24 :-(

The +5 byte change on the update is due to

-                 return 'v24.0.12 dirty';
+                 return 'v24.0.12-5-g381e986';

The actual code change is applied (but bytewise the same size):

$ 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
Copy link
Member

blizzz commented May 23, 2024

we don't have tests for 24 :-(

manual update test was successful

@blizzz blizzz merged commit 4b20bd3 into stable24 May 23, 2024
1 check passed
@blizzz blizzz deleted the backport/556/stable24 branch May 23, 2024 13:14
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.

3 participants