Skip to content

Python: fix(core): restrict unpickler module-prefix allowlist to types only #5923

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
White-Mouse wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Python: fix(core): restrict unpickler module-prefix allowlist to types only #5923

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
22 changes: 16 additions & 6 deletions python/packages/core/agent_framework/_workflows/_checkpoint_encoding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,24 @@ def __init__(self, data: bytes, allowed_types: frozenset[str]) -> None:
def find_class(self, module: str, name: str) -> type:
type_key = f"{module}:{name}"

if (
type_key in _BUILTIN_ALLOWED_TYPE_KEYS
or type_key in self._allowed_types
or module.startswith(_FRAMEWORK_MODULE_PREFIX)
or module.startswith(_OPENAI_MODULE_PREFIX)
):
if type_key in _BUILTIN_ALLOWED_TYPE_KEYS or type_key in self._allowed_types:
return super().find_class(module, name) # type: ignore[no-any-return] # nosec

Comment on lines 99 to 104
Comment on lines +102 to 104
if module.startswith(_FRAMEWORK_MODULE_PREFIX) or module.startswith(
_OPENAI_MODULE_PREFIX
):
resolved = super().find_class(module, name) # nosec
# Reject non-type globals from allowed package prefixes. A broad
# module-prefix allowlist returns arbitrary module attributes such
# as functions and sub-modules, which can be combined with
# builtins.getattr to call unrestricted pickle.loads.
if isinstance(resolved, type):
return resolved # type: ignore[return-value]
raise pickle.UnpicklingError(
f"Checkpoint deserialization blocked for non-type global "
f"'{type_key}'."
)
Comment on lines +105 to +118

raise pickle.UnpicklingError(
f"Checkpoint deserialization blocked for type '{type_key}'. "
f"To allow this type, either include its 'module:qualname' key in the "
Expand Down
Loading