mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #26759 from nextcloud/backport/26747/stable21 

[stable21] Fix installer deprecation warnings for PHP 8
This commit is contained in:
Roeland Jago Douma 2021-04-26 20:41:49 +02:00 committed by GitHub
parent c4acfa74e3 63fa7d9354
commit e075f80f41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/private/Installer.php
View File

@ -309,7 +309,10 @@ class Installer {
// Check if the signature actually matches the downloaded content // Check if the signature actually matches the downloaded content
$certificate = openssl_get_publickey($app['certificate']); $certificate = openssl_get_publickey($app['certificate']);
$verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512); $verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
openssl_free_key($certificate); // PHP 8+ deprecates openssl_free_key and automatically destroys the key instance when it goes out of scope
if ((PHP_VERSION_ID < 80000)) {
openssl_free_key($certificate);
}
if ($verified === true) { if ($verified === true) {
// Seems to match, let's proceed // Seems to match, let's proceed
@ -341,9 +344,13 @@ class Installer {
} }
// Check if appinfo/info.xml has the same app ID as well // Check if appinfo/info.xml has the same app ID as well
$loadEntities = libxml_disable_entity_loader(false); if ((PHP_VERSION_ID < 80000)) {
$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml'); $loadEntities = libxml_disable_entity_loader(false);
libxml_disable_entity_loader($loadEntities); $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
libxml_disable_entity_loader($loadEntities);
} else {
$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
}
if ((string)$xml->id !== $appId) { if ((string)$xml->id !== $appId) {
throw new \Exception( throw new \Exception(
sprintf( sprintf(