[3.12] gh-115133: Fix tests for XMLPullParser with Expat 2.6.0 (GH-115164) (GH-115288)

Feeding the parser by too small chunks defers parsing to prevent
CVE-2023-52425. Future versions of Expat may be more reactive.
(cherry picked from commit 4a08e7b343)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
Miss Islington (bot) 2024-02-11 11:34:04 +01:00 committed by GitHub
parent 6e13e50859
commit c4fa79b924
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 38 additions and 22 deletions

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):
@ -1400,9 +1405,7 @@ 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):
with self.subTest(chunk_size=chunk_size):
parser = ET.XMLPullParser() parser = ET.XMLPullParser()
self.assert_event_tags(parser, []) self.assert_event_tags(parser, [])
self._feed(parser, "<!-- comment -->\n", chunk_size) self._feed(parser, "<!-- comment -->\n", chunk_size)
@ -1423,6 +1426,17 @@ class XMLPullParserTest(unittest.TestCase):
self.assert_event_tags(parser, [('end', 'root')]) self.assert_event_tags(parser, [('end', 'root')])
self.assertIsNone(parser.close()) 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()
it = parser.read_events() it = parser.read_events()

View file

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