From 143c7ba4972ee1390b200faca5fea21732242759 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sun, 2 Oct 2022 11:05:07 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- xlamr_stog/utils/archival.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/xlamr_stog/utils/archival.py b/xlamr_stog/utils/archival.py index efda5d4..6685ea8 100644 --- a/xlamr_stog/utils/archival.py +++ b/xlamr_stog/utils/archival.py @@ -92,7 +92,26 @@ def load_archive(archive_file: str, tempdir = tempfile.mkdtemp() logger.info(f"extracting archive file {resolved_archive_file} to temp dir {tempdir}") with tarfile.open(resolved_archive_file, 'r:gz') as archive: - archive.extractall(tempdir) + 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(archive, tempdir) serialization_dir = tempdir From cd6f8fa2992c3c9a8fe78fd9a32b193954a5eb33 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 4 Oct 2022 17:21:58 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- xlamr_stog/utils/archival.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xlamr_stog/utils/archival.py b/xlamr_stog/utils/archival.py index 6685ea8..8f7760b 100644 --- a/xlamr_stog/utils/archival.py +++ b/xlamr_stog/utils/archival.py @@ -108,7 +108,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(archive, tempdir)