From 47fe725bd40f03cc1b73e1f7855c12926477296f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 27 Aug 2012 13:36:18 +0200 Subject: [PATCH] disabled network access when loading XML documents --- .../Component/DependencyInjection/Loader/XmlFileLoader.php | 2 +- src/Symfony/Component/Routing/Loader/XmlFileLoader.php | 2 +- src/Symfony/Component/Serializer/Encoder/XmlEncoder.php | 2 +- src/Symfony/Component/Translation/Loader/XliffFileLoader.php | 2 +- .../Component/Validator/Mapping/Loader/XmlFileLoader.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php index 9521097fe0..d9f13e1536 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php @@ -216,7 +216,7 @@ class XmlFileLoader extends FileLoader $dom = new \DOMDocument(); $dom->validateOnParse = true; - if (!$dom->load($file, defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0)) { + if (!$dom->load($file, LIBXML_NONET | (defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0))) { throw new \InvalidArgumentException(implode("\n", $this->getXmlErrors($internalErrors))); } $dom->normalizeDocument(); diff --git a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php index d7f1677b9f..6cca9e40a9 100644 --- a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php @@ -155,7 +155,7 @@ class XmlFileLoader extends FileLoader $dom = new \DOMDocument(); $dom->validateOnParse = true; - if (!$dom->load($file, defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0)) { + if (!$dom->load($file, LIBXML_NONET | (defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0))) { throw new \InvalidArgumentException(implode("\n", $this->getXmlErrors($internalErrors))); } $dom->normalizeDocument(); diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php index 6dd8a3f1d8..1b23c23f3f 100644 --- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php @@ -59,7 +59,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec libxml_clear_errors(); $dom = new \DOMDocument(); - $dom->loadXML($data); + $dom->loadXML($data, LIBXML_NONET); libxml_use_internal_errors($internalErrors); libxml_disable_entity_loader($disableEntities); diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php index 86885eaf5a..c15115ea49 100644 --- a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php @@ -60,7 +60,7 @@ class XliffFileLoader implements LoaderInterface $dom = new \DOMDocument(); $dom->validateOnParse = true; - if (!@$dom->load($file, defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0)) { + if (!@$dom->load($file, LIBXML_NONET | (defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0))) { throw new \RuntimeException(implode("\n", $this->getXmlErrors($internalErrors))); } diff --git a/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php index d85e857681..b17eb5374f 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php @@ -185,7 +185,7 @@ class XmlFileLoader extends FileLoader $dom = new \DOMDocument(); $dom->validateOnParse = true; - if (!$dom->load($file, defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0)) { + if (!$dom->load($file, LIBXML_NONET | (defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0))) { throw new MappingException(implode("\n", $this->getXmlErrors($internalErrors))); } if (!$dom->schemaValidate(__DIR__.'/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd')) {