From fbcfc5357e5c9a62feed21ee0fdf2f0789005dcc Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Mon, 3 Oct 2022 11:34:17 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- library/utils/file_utils.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/library/utils/file_utils.py b/library/utils/file_utils.py index c783984..7519bbb 100644 --- a/library/utils/file_utils.py +++ b/library/utils/file_utils.py @@ -166,7 +166,26 @@ def untar(source_filename, destination_dir='.', verbose=False): print('Unzipping tarball data from %s to %s', source_filename, destination_dir) try: with tarfile.open(source_filename) as tar: - tar.extractall(destination_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, destination_dir) tar.close() return True except: From f27bb52889244c1745591568f727d536416eb4c2 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Wed, 5 Oct 2022 01:13:11 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- library/utils/file_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/utils/file_utils.py b/library/utils/file_utils.py index 7519bbb..3ed2fcd 100644 --- a/library/utils/file_utils.py +++ b/library/utils/file_utils.py @@ -182,7 +182,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, destination_dir)