From e32a238d93d8087019b8eb09eb0535f4ddae3441 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sun, 2 Oct 2022 11:25:42 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- src/code/fetch_utilities.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/code/fetch_utilities.py b/src/code/fetch_utilities.py index 23d70d6..f017396 100644 --- a/src/code/fetch_utilities.py +++ b/src/code/fetch_utilities.py @@ -102,7 +102,26 @@ def download(version_dict): while os.path.splitext(filename)[1] in ARCHIVES: if tarfile.is_tarfile(filename): with tarfile.open(filename) as tar: - tar.extractall(path=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=DIR) file_list = tar.getnames() elif zipfile.is_zipfile(filename): with zipfile.ZipFile(filename) as zfile: From 1078502209f6ca696259c1ce1b26217b217ee3b4 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 4 Oct 2022 17:26:26 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- src/code/fetch_utilities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code/fetch_utilities.py b/src/code/fetch_utilities.py index f017396..d2f8834 100644 --- a/src/code/fetch_utilities.py +++ b/src/code/fetch_utilities.py @@ -118,7 +118,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=DIR)