upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #39498 from nextcloud/backport/39490/stable20

Browse source 
[stable20] fix(apps): Fix loading info.xml file
This commit is contained in:
Arthur Schiwon 2023-07-20 16:22:30 +02:00 committed by GitHub
commit 3f61e6d196
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/base.php
View file

@ -552,6 +552,11 @@ class OC {
}
public static function init() {
// prevent any XML processing from loading external entities
libxml_set_external_entity_loader(static function () {
return null;
});
// calculate the root directories
OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));

2
lib/private/App/CodeChecker/DatabaseSchemaChecker.php
View file

@ -42,7 +42,7 @@ class DatabaseSchemaChecker {
libxml_use_internal_errors(true);
$loadEntities = libxml_disable_entity_loader(false);
$xml = simplexml_load_file($appPath . '/appinfo/database.xml');
$xml = simplexml_load_string(file_get_contents($appPath . '/appinfo/database.xml'));
libxml_disable_entity_loader($loadEntities);

12
lib/private/App/CodeChecker/InfoChecker.php
View file

@ -44,6 +44,14 @@ class InfoChecker extends BasicEmitter {
throw new \RuntimeException("No app with given id <$appId> known.");
}
libxml_set_external_entity_loader(static function ($public, $system, $context) {
if ($system === \OC::$SERVERROOT . '/resources/app-info.xsd'
|| \OC::$SERVERROOT . '/resources/app-info-shipped.xsd') {
return $system;
}
return null;
});
$xml = new \DOMDocument();
$xml->load($appPath . '/appinfo/info.xml');
@ -68,6 +76,10 @@ class InfoChecker extends BasicEmitter {
}
}
libxml_set_external_entity_loader(static function () {
return null;
});
return $errors;
}

2
lib/private/App/InfoParser.php
View file

@ -62,7 +62,7 @@ class InfoParser {
libxml_use_internal_errors(true);
$loadEntities = libxml_disable_entity_loader(false);
$xml = simplexml_load_file($file);
$xml = simplexml_load_string(file_get_contents($file));
libxml_disable_entity_loader($loadEntities);
if ($xml === false) {

2
lib/private/DB/MDB2SchemaReader.php
View file

@ -67,7 +67,7 @@ class MDB2SchemaReader {
*/
public function loadSchemaFromFile($file, Schema $schema) {
$loadEntities = libxml_disable_entity_loader(false);
$xml = simplexml_load_file($file);
$xml = simplexml_load_string(file_get_contents($file));
libxml_disable_entity_loader($loadEntities);
foreach ($xml->children() as $child) {
/**

2
lib/private/Installer.php
View file

@ -316,7 +316,7 @@ class Installer {
// 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');
$xml = simplexml_load_string(file_get_contents($extractDir . '/' . $folders[0] . '/appinfo/info.xml'));
libxml_disable_entity_loader($loadEntities);
if ((string)$xml->id !== $appId) {
throw new \Exception(