mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-24 10:24:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

gh-115133: Fix tests for XMLPullParser with Expat 2.6.0 (GH-115164)

Browse Source 
Feeding the parser by too small chunks defers parsing to prevent
CVE-2023-52425. Future versions of Expat may be more reactive.
This commit is contained in:
Serhiy Storchaka 2024-02-11 12:08:39 +02:00 committed by GitHub
parent 4b75032c88
commit 4a08e7b343
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Lib/test/test_xml_etree.py
View File

@ -13,6 +13,7 @@ import itertools
import operator import operator
import os import os
import pickle import pickle
import pyexpat
import sys import sys
import textwrap import textwrap
import types import types
@ -120,6 +121,10 @@ ATTLIST_XML = """\
</foo> </foo>
""" """
fails_with_expat_2_6_0 = (unittest.expectedFailure
if pyexpat.version_info >= (2, 6, 0) else
lambda test: test)
def checkwarnings(*filters, quiet=False): def checkwarnings(*filters, quiet=False):
def decorator(test): def decorator(test):
def newtest(*args, **kwargs): def newtest(*args, **kwargs):
@ -1480,28 +1485,37 @@ class XMLPullParserTest(unittest.TestCase):
self.assertEqual([(action, elem.tag) for action, elem in events], self.assertEqual([(action, elem.tag) for action, elem in events],
expected) expected)
def test_simple_xml(self): def test_simple_xml(self, chunk_size=None):
for chunk_size in (None, 1, 5): parser = ET.XMLPullParser()
with self.subTest(chunk_size=chunk_size): self.assert_event_tags(parser, [])
parser = ET.XMLPullParser() self._feed(parser, "<!-- comment -->\n", chunk_size)
self.assert_event_tags(parser, []) self.assert_event_tags(parser, [])
self._feed(parser, "<!-- comment -->\n", chunk_size) self._feed(parser,
self.assert_event_tags(parser, []) "<root>\n <element key='value'>text</element",
self._feed(parser, chunk_size)
"<root>\n <element key='value'>text</element", self.assert_event_tags(parser, [])
chunk_size) self._feed(parser, ">\n", chunk_size)
self.assert_event_tags(parser, []) self.assert_event_tags(parser, [('end', 'element')])
self._feed(parser, ">\n", chunk_size) self._feed(parser, "<element>text</element>tail\n", chunk_size)
self.assert_event_tags(parser, [('end', 'element')]) self._feed(parser, "<empty-element/>\n", chunk_size)
self._feed(parser, "<element>text</element>tail\n", chunk_size) self.assert_event_tags(parser, [
self._feed(parser, "<empty-element/>\n", chunk_size) ('end', 'element'),
self.assert_event_tags(parser, [ ('end', 'empty-element'),
('end', 'element'), ])
('end', 'empty-element'), self._feed(parser, "</root>\n", chunk_size)
]) self.assert_event_tags(parser, [('end', 'root')])
self._feed(parser, "</root>\n", chunk_size) self.assertIsNone(parser.close())
self.assert_event_tags(parser, [('end', 'root')])
self.assertIsNone(parser.close()) @fails_with_expat_2_6_0
def test_simple_xml_chunk_1(self):
self.test_simple_xml(chunk_size=1)
@fails_with_expat_2_6_0
def test_simple_xml_chunk_5(self):
self.test_simple_xml(chunk_size=5)
def test_simple_xml_chunk_22(self):
self.test_simple_xml(chunk_size=22)
def test_feed_while_iterating(self): def test_feed_while_iterating(self):
parser = ET.XMLPullParser() parser = ET.XMLPullParser()

2
Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst Normal file
View File

@ -0,0 +1,2 @@
Fix tests for :class:`~xml.etree.ElementTree.XMLPullParser` with Expat
2.6.0.