Skip to content

Normalize non-ASCII errors in Base64 bytes loaders #456

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

Open
binggao1230 wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Normalize non-ASCII errors in Base64 bytes loaders #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ee0eab
Fix bytes loader Base64 validation
binggao1230 Jul 16, 2026
b30e8ec
Deduplicate Base64 validation message
binggao1230 Jul 16, 2026
686a15a
Narrow Base64 loader fix to Unicode errors
binggao1230 Sep 12, 2026
67eb34f
Fix ParamSpec bound source expectations
binggao1230 Oct 5, 2026
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
1 change: 1 addition & 0 deletions docs/changelog/fragments/+strict_base64.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Report non-ASCII Base64 input as a loader error for bytes-like values.
2 changes: 2 additions & 0 deletions src/adaptix/_internal/morphing/concrete_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@ def bytes_base64_loader(data):
encoded = data.encode("ascii")
except AttributeError:
raise TypeLoadError(str, data)
except UnicodeEncodeError:
raise ValueLoadError("Bad base64 string", data)

if not B64_PATTERN.fullmatch(encoded):
raise ValueLoadError("Bad base64 string", data)
Expand Down
5 changes: 5 additions & 0 deletions tests/unit/morphing/test_concrete_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,11 @@ def test_bytes_like_provider(
lambda: loader("Hello, world"),
)

raises_exc(
ValueLoadError("Bad base64 string", "🦄"),
lambda: loader("🦄"),
)

raises_exc(
ValueLoadError(
msg="Invalid base64-encoded string: number of data characters (5) cannot be 1 more than a multiple of 4",
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/type_tools/test_normalize_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ def test_forward_ref_at_type_var_limit():
P_FR1,
NormParamSpec(
P_FR1,
limit=Bound(nt_zero(int, source=ForwardRef("int"))),
limit=Bound(nt_zero(int, source=P_FR1.__bound__)),
source=P_FR1,
default=None,
),
Expand All @@ -847,7 +847,7 @@ def test_forward_ref_at_type_var_limit():
P_FR2,
NormParamSpec(
P_FR2,
limit=Bound(nt_zero(MyForwardClass, source=ForwardRef("MyForwardClass"))),
limit=Bound(nt_zero(MyForwardClass, source=P_FR2.__bound__)),
source=P_FR2,
default=None,
),
Expand Down
Loading