Skip to content

gh-155193: Add missing canonical parameter to urlsafe_b64decode() #155197

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
VITA2aishu wants to merge 1 commit into from
+6 −2
Closed

gh-155193: Add missing canonical parameter to urlsafe_b64decode() #155197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions Lib/base64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def urlsafe_b64encode(s, *, padded=True):
return binascii.b2a_base64(s, padded=padded, newline=False,
alphabet=binascii.URLSAFE_BASE64_ALPHABET)

def urlsafe_b64decode(s, *, padded=False):
def urlsafe_b64decode(s, *, padded=False, canonical=False):
"""Decode bytes using the URL- and filesystem-safe Base64 alphabet.

Argument s is a bytes-like object or ASCII string to decode. The result
Expand All @@ -175,6 +175,9 @@ def urlsafe_b64decode(s, *, padded=False):

If padded is false, padding in input is not required.

If canonical is true, non-canonical encodings (non-zero padding bits or
other non-canonical forms) are rejected.

The alphabet uses '-' instead of '+' and '_' instead of '/'.
"""
s = _bytes_from_decode_data(s)
Expand All @@ -184,7 +187,8 @@ def urlsafe_b64decode(s, *, padded=False):
badchar = b
break
s = s.translate(_urlsafe_decode_translation)
result = binascii.a2b_base64(s, strict_mode=False, padded=padded)
result = binascii.a2b_base64(s, strict_mode=False, padded=padded,
canonical=canonical)
if badchar is not None:
import warnings
warnings.warn(f'invalid character {chr(badchar)!a} in URL-safe Base64 data '
Expand Down
Loading