commit 479553c7c11306a09ce34edb6ef208133b7b95fe
author Miss Skeleton (bot) <31488909+miss-islington@users.noreply.github.com> Mon Oct 19 19:34:37 2020 -0700
committer GitHub <noreply@github.com> Mon Oct 19 19:34:37 2020 -0700
tree 6eef508a2e280911fea20749b54fbedf43708f8d
parent e43bee7e114ec361efde34f4b546f984574e6653

bpo-42051: Reject XML entity declarations in plist files (GH-22760)

(cherry picked from commit 05ee790f4d1cd8725a90b54268fc1dfe5b4d1fa2)

Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>

Lib/plistlib.py

diff --git a/Lib/plistlib.py b/Lib/plistlib.py
index aff5fe3..ba7ac19 100644
--- a/Lib/plistlib.py
+++ b/Lib/plistlib.py
@@ -173,9 +173,16 @@
         self.parser.StartElementHandler = self.handle_begin_element
         self.parser.EndElementHandler = self.handle_end_element
         self.parser.CharacterDataHandler = self.handle_data
+        self.parser.EntityDeclHandler = self.handle_entity_decl
         self.parser.ParseFile(fileobj)
         return self.root
 
+    def handle_entity_decl(self, entity_name, is_parameter_entity, value, base, system_id, public_id, notation_name):
+        # Reject plist files with entity declarations to avoid XML vulnerabilies in expat.
+        # Regular plist files don't contain those declerations, and Apple's plutil tool does not
+        # accept them either.
+        raise InvalidFileException("XML entity declarations are not supported in plist files")
+
     def handle_begin_element(self, element, attrs):
         self.data = []
         handler = getattr(self, "begin_" + element, None)

Lib/test/test_plistlib.py

diff --git a/Lib/test/test_plistlib.py b/Lib/test/test_plistlib.py
index e82a53c..7cc6bad 100644
--- a/Lib/test/test_plistlib.py
+++ b/Lib/test/test_plistlib.py
@@ -105,6 +105,19 @@
         AAABOQ=='''),
 }
 
+XML_PLIST_WITH_ENTITY=b'''\
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd" [
+   <!ENTITY entity "replacement text">
+  ]>
+<plist version="1.0">
+  <dict>
+    <key>A</key>
+    <string>&entity;</string>
+  </dict>
+</plist>
+'''
+
 
 class TestPlistlib(unittest.TestCase):
 
@@ -523,6 +536,11 @@
         with self.assertRaises(OverflowError):
             plistlib.dumps(huge_uid, fmt=plistlib.FMT_BINARY)
 
+    def test_xml_plist_with_entity_decl(self):
+        with self.assertRaisesRegex(plistlib.InvalidFileException,
+                                    "XML entity declarations are not supported"):
+            plistlib.loads(XML_PLIST_WITH_ENTITY, fmt=plistlib.FMT_XML)
+
 
 class TestBinaryPlistlib(unittest.TestCase):