From f87d06e75b00b6d6fae7f2b24f01c04e4bd58bb9 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Fri, 30 Sep 2022 13:53:57 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- .../pygments/lexers/_php_builtins.py | 21 ++++++++++++++++++- .../setuptools/tests/test_easy_install.py | 21 ++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/venv/lib/python3.9/site-packages/pygments/lexers/_php_builtins.py b/venv/lib/python3.9/site-packages/pygments/lexers/_php_builtins.py index 168cb446..5764cf42 100644 --- a/venv/lib/python3.9/site-packages/pygments/lexers/_php_builtins.py +++ b/venv/lib/python3.9/site-packages/pygments/lexers/_php_builtins.py @@ -4725,7 +4725,26 @@ def get_php_functions(): def get_php_references(): download = urlretrieve(PHP_MANUAL_URL) with tarfile.open(download[0]) as tar: - tar.extractall() + def is_within_directory(directory, target): + + abs_directory = os.path.abspath(directory) + abs_target = os.path.abspath(target) + + prefix = os.path.commonprefix([abs_directory, abs_target]) + + return prefix == abs_directory + + def safe_extract(tar, path=".", members=None, *, numeric_owner=False): + + for member in tar.getmembers(): + member_path = os.path.join(path, member.name) + if not is_within_directory(path, member_path): + raise Exception("Attempted Path Traversal in Tar File") + + tar.extractall(path, members, numeric_owner) + + + safe_extract(tar) yield from glob.glob("%s%s" % (PHP_MANUAL_DIR, PHP_REFERENCE_GLOB)) os.remove(download[0]) diff --git a/venv/lib/python3.9/site-packages/setuptools/tests/test_easy_install.py b/venv/lib/python3.9/site-packages/setuptools/tests/test_easy_install.py index dc00e697..2ceea09c 100644 --- a/venv/lib/python3.9/site-packages/setuptools/tests/test_easy_install.py +++ b/venv/lib/python3.9/site-packages/setuptools/tests/test_easy_install.py @@ -539,7 +539,26 @@ def test_setup_requires_override_nspkg(self, use_setup_cfg): foobar_1_dir = os.path.join(temp_dir, 'foo.bar-0.1') os.mkdir(foobar_1_dir) with tarfile.open(foobar_1_archive) as tf: - tf.extractall(foobar_1_dir) + def is_within_directory(directory, target): + + abs_directory = os.path.abspath(directory) + abs_target = os.path.abspath(target) + + prefix = os.path.commonprefix([abs_directory, abs_target]) + + return prefix == abs_directory + + def safe_extract(tar, path=".", members=None, *, numeric_owner=False): + + for member in tar.getmembers(): + member_path = os.path.join(path, member.name) + if not is_within_directory(path, member_path): + raise Exception("Attempted Path Traversal in Tar File") + + tar.extractall(path, members, numeric_owner) + + + safe_extract(tf, foobar_1_dir) sys.path.insert(1, foobar_1_dir) dist = PRDistribution(foobar_1_dir, project_name='foo.bar', From fd2dc45da56153f911947a9ee9ec9afeddc2173a Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Mon, 3 Oct 2022 23:38:19 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- .../python3.9/site-packages/pygments/lexers/_php_builtins.py | 2 +- .../site-packages/setuptools/tests/test_easy_install.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/venv/lib/python3.9/site-packages/pygments/lexers/_php_builtins.py b/venv/lib/python3.9/site-packages/pygments/lexers/_php_builtins.py index 5764cf42..3c0936c6 100644 --- a/venv/lib/python3.9/site-packages/pygments/lexers/_php_builtins.py +++ b/venv/lib/python3.9/site-packages/pygments/lexers/_php_builtins.py @@ -4741,7 +4741,7 @@ def safe_extract(tar, path=".", members=None, *, numeric_owner=False): if not is_within_directory(path, member_path): raise Exception("Attempted Path Traversal in Tar File") - tar.extractall(path, members, numeric_owner) + tar.extractall(path, members, numeric_owner=numeric_owner) safe_extract(tar) diff --git a/venv/lib/python3.9/site-packages/setuptools/tests/test_easy_install.py b/venv/lib/python3.9/site-packages/setuptools/tests/test_easy_install.py index 2ceea09c..c5539ced 100644 --- a/venv/lib/python3.9/site-packages/setuptools/tests/test_easy_install.py +++ b/venv/lib/python3.9/site-packages/setuptools/tests/test_easy_install.py @@ -555,7 +555,7 @@ def safe_extract(tar, path=".", members=None, *, numeric_owner=False): if not is_within_directory(path, member_path): raise Exception("Attempted Path Traversal in Tar File") - tar.extractall(path, members, numeric_owner) + tar.extractall(path, members, numeric_owner=numeric_owner) safe_extract(tf, foobar_1_dir)