Skip to content

bpo-29427: allow unpadded input and ouput in base64 module #7072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
guillp wants to merge 8 commits into from
Closed

bpo-29427: allow unpadded input and ouput in base64 module #7072

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d6d4d93
allow parsing and base64
guillp May 23, 2018
dd69e85
updated base64 unittests for unpadded input/output
guillp May 23, 2018
698ec49
added NEWS.d entry for bpo-29427
guillp May 23, 2018
8eb9823
fixed b64decode on non padded strings
guillp May 24, 2018
df1102c
more base64 test cases for unpadded input
guillp May 24, 2018
1b307ea
fixed indentation
guillp May 24, 2018
77618ad
Update Misc/NEWS.d/next/Library/2018-05-23-18-02-03.bpo-29427.82cb18.rst
guillp Oct 8, 2019
df3d326
typos
guillp Oct 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
more base64 test cases for unpadded input
  • Loading branch information
@guillp
guillp authored May 24, 2018
commit df1102c42a5ddd06da85d0e65b2cd13f08de173f
31 changes: 31 additions & 0 deletions Lib/test/test_base64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ def test_b64decode(self):
self.assertEqual(base64.b64decode(b'abc', padded=False), b'i\xb7')
self.assertEqual(base64.b64decode('abc', padded=False), b'i\xb7')
self.assertEqual(base64.urlsafe_b64decode('abcd_-', padded=False), b'i\xb7\x1d\xff')
self.assertEquals(base64.b64decode(b'ab=', padded=False), b'i')

def test_b64decode_padding_error(self):
self.assertRaises(binascii.Error, base64.b64decode, b'abc')
Expand Down Expand Up @@ -283,6 +284,36 @@ def test_b64decode_invalid_chars(self):
res = b'\xFB\xEF\xBE\xFF\xFF\xFF'
self.assertEqual(base64.b64decode(b'++[[//]]', b'[]'), res)
self.assertEqual(base64.urlsafe_b64decode(b'++--//__'), res)

def test_b64decode_unpadded_invalid_chars(self):
# issue 1466065: Test some invalid characters.
tests = ((b'%3d', b'\xdd'),
(b'$3d', b'\xdd'),
(b'[', b''),
(b'YW]3', b'am'),
(b'3{d', b'\xdd'),
(b'3d}', b'\xdd'),
(b'@@', b''),
(b'!', b''),
(b'YWJj\nYWI', b'abcab'))
funcs = (
base64.b64decode,
base64.urlsafe_b64decode,
)
for bstr, res in tests:
for func in funcs:
with self.subTest(bstr=bstr, func=func):
self.assertEqual(func(bstr, padded=False), res)
self.assertEqual(func(bstr.decode('ascii'), padded=False), res)
with self.assertRaises(binascii.Error):
base64.b64decode(bstr, validate=True, padded=False)
with self.assertRaises(binascii.Error):
base64.b64decode(bstr.decode('ascii'), validate=True, padded=False)

# Normal alphabet characters not discarded when alternative given
res = b'\xFB\xEF\xBE\xFF\xFF\xFF'
self.assertEqual(base64.b64decode(b'++[[//]]', b'[]'), res)
self.assertEqual(base64.urlsafe_b64decode(b'++--//__'), res)

def test_b32encode(self):
eq = self.assertEqual
Expand Down