Merge pull request #39497 from nextcloud/backport/39490/stable21

[stable21] fix(apps): Fix loading info.xml file
pull/41130/head
Arthur Schiwon 10 months ago committed by GitHub
commit 61b72330b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -545,6 +545,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));

@ -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);

@ -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;
}

@ -33,7 +33,7 @@ namespace OC\App;
use OCP\ICache;
use function libxml_disable_entity_loader;
use function simplexml_load_file;
use function simplexml_load_string;
class InfoParser {
/** @var \OCP\ICache|null */
@ -65,10 +65,10 @@ class InfoParser {
libxml_use_internal_errors(true);
if ((PHP_VERSION_ID < 80000)) {
$loadEntities = libxml_disable_entity_loader(false);
$xml = simplexml_load_file($file);
$xml = simplexml_load_string(file_get_contents($file));
libxml_disable_entity_loader($loadEntities);
} else {
$xml = simplexml_load_file($file);
$xml = simplexml_load_string(file_get_contents($file));
}
if ($xml === false) {

@ -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) {
/**

@ -344,10 +344,10 @@ class Installer {
// Check if appinfo/info.xml has the same app ID as well
if ((PHP_VERSION_ID < 80000)) {
$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);
} else {
$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
$xml = simplexml_load_string(file_get_contents($extractDir . '/' . $folders[0] . '/appinfo/info.xml'));
}
if ((string)$xml->id !== $appId) {
throw new \Exception(

Loading…
Cancel
Save