mirror of
https://github.com/python/cpython.git
synced 2025-07-23 11:15:24 +00:00
[3.11] gh-95778: CVE-2020-10735: Prevent DoS by very large int() (#96500)
Integer to and from text conversions via CPython's bignum `int` type is not safe against denial of service attacks due to malicious input. Very large input strings with hundred thousands of digits can consume several CPU seconds.
This PR comes fresh from a pile of work done in our private PSRT security response team repo.
This backports https://github.com/python/cpython/pull/96499 aka 511ca94520
Signed-off-by: Christian Heimes [Red Hat] <christian@python.org>
Tons-of-polishing-up-by: Gregory P. Smith [Google] <greg@krypto.org>
Reviews via the private PSRT repo via many others (see the NEWS entry in the PR).
<!-- gh-issue-number: gh-95778 -->
* Issue: gh-95778
<!-- /gh-issue-number -->
I wrote up [a one pager for the release managers](https://docs.google.com/document/d/1KjuF_aXlzPUxTK4BMgezGJ2Pn7uevfX7g0_mvgHlL7Y/edit#).
This commit is contained in:
parent
57116d5682
commit
f8b71da9aa
27 changed files with 775 additions and 23 deletions
|
@ -577,5 +577,119 @@ class IntTestCases(unittest.TestCase):
|
|||
self.assertEqual(int('1_2_3_4_5_6_7', 32), 1144132807)
|
||||
|
||||
|
||||
class IntStrDigitLimitsTests(unittest.TestCase):
|
||||
|
||||
int_class = int # Override this in subclasses to reuse the suite.
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self._previous_limit = sys.get_int_max_str_digits()
|
||||
sys.set_int_max_str_digits(2048)
|
||||
|
||||
def tearDown(self):
|
||||
sys.set_int_max_str_digits(self._previous_limit)
|
||||
super().tearDown()
|
||||
|
||||
def test_disabled_limit(self):
|
||||
self.assertGreater(sys.get_int_max_str_digits(), 0)
|
||||
self.assertLess(sys.get_int_max_str_digits(), 20_000)
|
||||
with support.adjust_int_max_str_digits(0):
|
||||
self.assertEqual(sys.get_int_max_str_digits(), 0)
|
||||
i = self.int_class('1' * 20_000)
|
||||
str(i)
|
||||
self.assertGreater(sys.get_int_max_str_digits(), 0)
|
||||
|
||||
def test_max_str_digits_edge_cases(self):
|
||||
"""Ignore the +/- sign and space padding."""
|
||||
int_class = self.int_class
|
||||
maxdigits = sys.get_int_max_str_digits()
|
||||
|
||||
int_class('1' * maxdigits)
|
||||
int_class(' ' + '1' * maxdigits)
|
||||
int_class('1' * maxdigits + ' ')
|
||||
int_class('+' + '1' * maxdigits)
|
||||
int_class('-' + '1' * maxdigits)
|
||||
self.assertEqual(len(str(10 ** (maxdigits - 1))), maxdigits)
|
||||
|
||||
def check(self, i, base=None):
|
||||
with self.assertRaises(ValueError):
|
||||
if base is None:
|
||||
self.int_class(i)
|
||||
else:
|
||||
self.int_class(i, base)
|
||||
|
||||
def test_max_str_digits(self):
|
||||
maxdigits = sys.get_int_max_str_digits()
|
||||
|
||||
self.check('1' * (maxdigits + 1))
|
||||
self.check(' ' + '1' * (maxdigits + 1))
|
||||
self.check('1' * (maxdigits + 1) + ' ')
|
||||
self.check('+' + '1' * (maxdigits + 1))
|
||||
self.check('-' + '1' * (maxdigits + 1))
|
||||
self.check('1' * (maxdigits + 1))
|
||||
|
||||
i = 10 ** maxdigits
|
||||
with self.assertRaises(ValueError):
|
||||
str(i)
|
||||
|
||||
def test_power_of_two_bases_unlimited(self):
|
||||
"""The limit does not apply to power of 2 bases."""
|
||||
maxdigits = sys.get_int_max_str_digits()
|
||||
|
||||
for base in (2, 4, 8, 16, 32):
|
||||
with self.subTest(base=base):
|
||||
self.int_class('1' * (maxdigits + 1), base)
|
||||
assert maxdigits < 100_000
|
||||
self.int_class('1' * 100_000, base)
|
||||
|
||||
def test_underscores_ignored(self):
|
||||
maxdigits = sys.get_int_max_str_digits()
|
||||
|
||||
triples = maxdigits // 3
|
||||
s = '111' * triples
|
||||
s_ = '1_11' * triples
|
||||
self.int_class(s) # succeeds
|
||||
self.int_class(s_) # succeeds
|
||||
self.check(f'{s}111')
|
||||
self.check(f'{s_}_111')
|
||||
|
||||
def test_sign_not_counted(self):
|
||||
int_class = self.int_class
|
||||
max_digits = sys.get_int_max_str_digits()
|
||||
s = '5' * max_digits
|
||||
i = int_class(s)
|
||||
pos_i = int_class(f'+{s}')
|
||||
assert i == pos_i
|
||||
neg_i = int_class(f'-{s}')
|
||||
assert -pos_i == neg_i
|
||||
str(pos_i)
|
||||
str(neg_i)
|
||||
|
||||
def _other_base_helper(self, base):
|
||||
int_class = self.int_class
|
||||
max_digits = sys.get_int_max_str_digits()
|
||||
s = '2' * max_digits
|
||||
i = int_class(s, base)
|
||||
if base > 10:
|
||||
with self.assertRaises(ValueError):
|
||||
str(i)
|
||||
elif base < 10:
|
||||
str(i)
|
||||
with self.assertRaises(ValueError) as err:
|
||||
int_class(f'{s}1', base)
|
||||
|
||||
def test_int_from_other_bases(self):
|
||||
base = 3
|
||||
with self.subTest(base=base):
|
||||
self._other_base_helper(base)
|
||||
base = 36
|
||||
with self.subTest(base=base):
|
||||
self._other_base_helper(base)
|
||||
|
||||
|
||||
class IntSubclassStrDigitLimitsTests(IntStrDigitLimitsTests):
|
||||
int_class = IntSubclass
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue