From 1b85c71a2136d3fa6a1da05b27b1fe4e4b8ee45e Mon Sep 17 00:00:00 2001 From: Tal Einat Date: Sun, 10 Jun 2018 10:01:50 +0300 Subject: bpo-33770: improve base64 exception message for encoded inputs of invalid length (#7416) --- Lib/test/test_binascii.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'Lib/test/test_binascii.py') diff --git a/Lib/test/test_binascii.py b/Lib/test/test_binascii.py index 0997d9432b..c5fcc1ac16 100644 --- a/Lib/test/test_binascii.py +++ b/Lib/test/test_binascii.py @@ -110,6 +110,34 @@ class BinASCIITest(unittest.TestCase): # empty strings. TBD: shouldn't it raise an exception instead ? self.assertEqual(binascii.a2b_base64(self.type2test(fillers)), b'') + def test_base64errors(self): + # Test base64 with invalid padding + def assertIncorrectPadding(data): + with self.assertRaisesRegex(binascii.Error, r'(?i)Incorrect padding'): + binascii.a2b_base64(self.type2test(data)) + + assertIncorrectPadding(b'ab') + assertIncorrectPadding(b'ab=') + assertIncorrectPadding(b'abc') + assertIncorrectPadding(b'abcdef') + assertIncorrectPadding(b'abcdef=') + assertIncorrectPadding(b'abcdefg') + assertIncorrectPadding(b'a=b=') + assertIncorrectPadding(b'a\nb=') + + # Test base64 with invalid number of valid characters (1 mod 4) + def assertInvalidLength(data): + with self.assertRaisesRegex(binascii.Error, r'(?i)invalid.+length'): + binascii.a2b_base64(self.type2test(data)) + + assertInvalidLength(b'a') + assertInvalidLength(b'a=') + assertInvalidLength(b'a==') + assertInvalidLength(b'a===') + assertInvalidLength(b'a' * 5) + assertInvalidLength(b'a' * (4 * 87 + 1)) + assertInvalidLength(b'A\tB\nC ??DE') # only 5 valid characters + def test_uu(self): MAX_UU = 45 for backtick in (True, False): -- cgit v1.2.1