From 49f4868a6486e6c0f9a1c3b292900a56b3a55210 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Thu, 6 Oct 2022 15:12:02 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- utils/file.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/utils/file.py b/utils/file.py index cc8f0fb..284a3d8 100644 --- a/utils/file.py +++ b/utils/file.py @@ -115,7 +115,26 @@ def extract_all(filename, path): ''' if tarfile.is_tarfile(filename): with tarfile.open(filename, 'r') as archive: - archive.extractall(path) + 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=numeric_owner) + + + safe_extract(archive, path) elif zipfile.is_zipfile(filename): with zipfile.ZipFile(filename, 'r') as archive: archive.extractall(path)