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.

Sign up for GitHub

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

Jump to bottom

Fix installer deprecation warnings for PHP 8 #26747

Merged
merged 2 commits into from Apr 26, 2021
Merged

Fix installer deprecation warnings for PHP 8 #26747

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5882648
Only use libxml_disable_entity_loader on PHP<8
solracsf Apr 25, 2021
3d900b1
PHP 8+ deprecates openssl_free_key
solracsf Apr 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions lib/private/Installer.php
View file
Open in desktop
Expand Up @@ -307,7 +307,10 @@ public function downloadApp($appId, $allowUnstable = false) {
// Check if the signature actually matches the downloaded content
$certificate = openssl_get_publickey($app['certificate']);
$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) {
// Seems to match, let's proceed
Expand Down Expand Up @@ -339,9 +342,13 @@ public function downloadApp($appId, $allowUnstable = false) {
}

// Check if appinfo/info.xml has the same app ID as well
$loadEntities = libxml_disable_entity_loader(false);
$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
libxml_disable_entity_loader($loadEntities);
if ((PHP_VERSION_ID < 80000)) {
$loadEntities = libxml_disable_entity_loader(false);
solracsf marked this conversation as resolved.
Show resolved Hide resolved
$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) {
throw new \Exception(
sprintf(
Expand Down