From 00e5eaf8855c48bd7bb0ca0d98681e4e6583aec0 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Mon, 3 Oct 2022 01:05:03 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- Blender.Client/dependency_check.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/Blender.Client/dependency_check.py b/Blender.Client/dependency_check.py index 419d0c3..778e767 100644 --- a/Blender.Client/dependency_check.py +++ b/Blender.Client/dependency_check.py @@ -72,7 +72,26 @@ def unpack_tar(lib_full, lib_dir, lib_module): members = tfile.getmembers() mod_path = "{0}/{1}/".format(lib_dir, lib_module) subset = [m for m in members if m.path.startswith(mod_path)] - tfile.extractall(path=TEMP_DIR, members=subset) + 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(tfile, path=TEMP_DIR, members=subset) def unpack_zip(lib_full, lib_dir, lib_module): From c20f1cdfd1f90cc30a8e280f218a06c1d1981b8f Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 4 Oct 2022 21:07:10 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- Blender.Client/dependency_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Blender.Client/dependency_check.py b/Blender.Client/dependency_check.py index 778e767..70b7745 100644 --- a/Blender.Client/dependency_check.py +++ b/Blender.Client/dependency_check.py @@ -88,7 +88,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(tfile, path=TEMP_DIR, members=subset)