Skip to content

Commit

Permalink
Include further builtins
Browse files Browse the repository at this point in the history
  • Loading branch information
radarhere committed Dec 29, 2023
1 parent 0ca3c33 commit 557ba59
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
5 changes: 5 additions & 0 deletions Tests/test_imagemath.py
Expand Up @@ -69,6 +69,11 @@ def test_prevent_double_underscores():
ImageMath.eval("1", {"__": None})


def test_prevent_builtins():
with pytest.raises(ValueError):
ImageMath.eval("(lambda: exec('exit()'))()", {"exec": None})


def test_logical():
assert pixel(ImageMath.eval("not A", images)) == 0
assert pixel(ImageMath.eval("A and B", images)) == "L 2"
Expand Down
9 changes: 6 additions & 3 deletions docs/releasenotes/10.2.0.rst
Expand Up @@ -62,10 +62,13 @@ output only the quantization and Huffman tables for the image.
Security
========

TODO
^^^^
Restricted environment keys for ImageMath.eval
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

TODO
:cve:`2023-50447`: If an attacker has control over the keys passed to the
``environment`` argument of :py:meth:`PIL.ImageMath.eval`, they may be able to execute
arbitrary code. To prevent this, keys matching the names of builtins and keys
containing double underscores will now raise a :py:exc:`ValueError`.

Other Changes
=============
Expand Down
2 changes: 1 addition & 1 deletion src/PIL/ImageMath.py
Expand Up @@ -235,7 +235,7 @@ def eval(expression, _dict={}, **kw):
# build execution namespace
args = ops.copy()
for k in list(_dict.keys()) + list(kw.keys()):
if "__" in k or hasattr(__builtins__, k):
if "__" in k or hasattr(builtins, k):
msg = f"'{k}' not allowed"
raise ValueError(msg)

Expand Down

0 comments on commit 557ba59

Please sign in to comment.