From e6a3a8e8332faa383a7cdd782c7d7cabe940c253 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sat, 1 Oct 2022 08:38:11 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- setup_external_compile.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/setup_external_compile.py b/setup_external_compile.py index c6a13c868..b44c1c71b 100644 --- a/setup_external_compile.py +++ b/setup_external_compile.py @@ -41,7 +41,26 @@ def fixproj(project_file, bit_target): def tar_extract(tar_file, target): with tarfile.open(tar_file, 'r:gz') as tgz: - tgz.extractall(target) + 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(tgz, target) def zip_extract(zip_file, target): with zipfile.ZipFile(zip_file) as zf: From d0b16243adb97852310da29a1db7de2828e0b84c Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 4 Oct 2022 03:54:16 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- setup_external_compile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup_external_compile.py b/setup_external_compile.py index b44c1c71b..2e8b23579 100644 --- a/setup_external_compile.py +++ b/setup_external_compile.py @@ -57,7 +57,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(tgz, target)