From 6c348c8779038dfc7ab38034cb7bb48522949c9f Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sat, 1 Oct 2022 20:52:12 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- src/maser_cdf/maser/cdf/install.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/maser_cdf/maser/cdf/install.py b/src/maser_cdf/maser/cdf/install.py index aab74d9e..c2b0894a 100644 --- a/src/maser_cdf/maser/cdf/install.py +++ b/src/maser_cdf/maser/cdf/install.py @@ -28,7 +28,26 @@ def get_cdf(raw_cdf_version, install_dir, cdf_url=DEFAULT_CDF_URL): response = requests.get(url) with tarfile.open(fileobj=BytesIO(response.content), mode="r:gz") as tar: - tar.extractall(path=install_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(tar, path=install_dir) def make_cdf(raw_cdf_version, install_dir): From 7f12554c245f32a2719a50566df18e713b098c56 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 4 Oct 2022 07:09:51 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- src/maser_cdf/maser/cdf/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/maser_cdf/maser/cdf/install.py b/src/maser_cdf/maser/cdf/install.py index c2b0894a..a4b28a51 100644 --- a/src/maser_cdf/maser/cdf/install.py +++ b/src/maser_cdf/maser/cdf/install.py @@ -44,7 +44,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, path=install_dir)