73 lines
2.6 KiB
Diff
73 lines
2.6 KiB
Diff
|
From e512bc799e3864fe3b1351757261762d63471efc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ned Deily <nad@python.org>
|
||
|
|
Date: Mon, 19 Oct 2020 22:36:27 -0400
|
||
|
|
Subject: [PATCH] bpo-42051: Reject XML entity declarations in plist files
|
||
|
|
(#22760) (GH-22801)
|
||
|
|
|
||
|
|
Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>
|
||
|
|
---
|
||
|
|
Lib/plistlib.py | 7 +++++++
|
||
|
|
Lib/test/test_plistlib.py | 18 ++++++++++++++++++
|
||
|
|
2 files changed, 25 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/Lib/plistlib.py b/Lib/plistlib.py
|
||
|
|
index 33b79a1..b273a15 100644
|
||
|
|
--- a/Lib/plistlib.py
|
||
|
|
+++ b/Lib/plistlib.py
|
||
|
|
@@ -257,9 +257,16 @@ class _PlistParser:
|
||
|
|
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)
|
||
|
|
diff --git a/Lib/test/test_plistlib.py b/Lib/test/test_plistlib.py
|
||
|
|
index 8d8e0a7..bfe06fd 100644
|
||
|
|
--- a/Lib/test/test_plistlib.py
|
||
|
|
+++ b/Lib/test/test_plistlib.py
|
||
|
|
@@ -90,6 +90,19 @@ TESTDATA={
|
||
|
|
xQHHAsQC0gAAAAAAAAIBAAAAAAAAADkAAAAAAAAAAAAAAAAAAALs'''),
|
||
|
|
}
|
||
|
|
|
||
|
|
+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):
|
||
|
|
|
||
|
|
@@ -443,6 +456,11 @@ class TestPlistlib(unittest.TestCase):
|
||
|
|
pl2 = plistlib.loads(data)
|
||
|
|
self.assertEqual(dict(pl), dict(pl2))
|
||
|
|
|
||
|
|
+ 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):
|
||
|
|
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|