File size: 2,140 Bytes
4d2a9bf | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | diff --git a/src/Toolkit/Xml.php b/src/Toolkit/Xml.php
index 011fada8d7..a4954b772a 100644
--- a/src/Toolkit/Xml.php
+++ b/src/Toolkit/Xml.php
@@ -271,7 +271,7 @@ public static function entities(): array
*/
public static function parse(string $xml): array|null
{
- $xml = @simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOENT);
+ $xml = @simplexml_load_string($xml);
if (is_object($xml) !== true) {
return null;
diff --git a/tests/Toolkit/XmlTest.php b/tests/Toolkit/XmlTest.php
index 6c0c6c9886..7959e02e57 100644
--- a/tests/Toolkit/XmlTest.php
+++ b/tests/Toolkit/XmlTest.php
@@ -139,6 +139,43 @@ public function testParseSimplifyCreate()
$this->assertNull(Xml::parse('<this>is invalid</that>'));
}
+ /**
+ * @covers ::parse
+ */
+ public function testParseEntities()
+ {
+ $xml = '<!DOCTYPE d [<!ENTITY e "bar">]><x>this is a file: foo &e; (with entities)</x>';
+ $array = Xml::parse($xml);
+
+ $this->assertSame([
+ '@name' => 'x',
+ '@value' => 'this is a file: foo bar (with entities)'
+ ], $array);
+ }
+
+ /**
+ * @covers ::parse
+ */
+ public function testParseRecursiveEntities()
+ {
+ $xml = file_get_contents(__DIR__ . '/fixtures/xml/billion-laughs.xml');
+ $this->assertNull(Xml::parse($xml));
+ }
+
+ /**
+ * @covers ::parse
+ */
+ public function testParseXXE()
+ {
+ $xml = '<!DOCTYPE d [<!ENTITY e SYSTEM "' . __FILE__ . '">]><x>this is a file: &e; with an XXE vulnerability</x>';
+ $array = Xml::parse($xml);
+
+ $this->assertSame([
+ '@name' => 'x',
+ '@value' => 'this is a file: with an XXE vulnerability'
+ ], $array);
+ }
+
/**
* @covers ::encode
* @covers ::decode
diff --git a/tests/Toolkit/fixtures/xml/billion-laughs.xml b/tests/Toolkit/fixtures/xml/billion-laughs.xml
new file mode 100644
index 0000000000..6cdc29cf26
--- /dev/null
+++ b/tests/Toolkit/fixtures/xml/billion-laughs.xml
@@ -0,0 +1,9 @@
+<!DOCTYPE xml [
+ <!ENTITY lol "lol">
+ <!ENTITY lol2 "&lol;&lol;&lol;&lol;&lol;&lol;">
+ <!ENTITY lol3 "&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;">
+ <!ENTITY lol4 "&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;">
+]>
+<xml>
+ <p>&lol4;</p>
+</xml>
|