From 780437013cef37f0ce60a49bbb337adbc9f48681 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sun, 20 Nov 2022 21:48:00 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- srdatasets/datasets/utils.py | 42 ++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/srdatasets/datasets/utils.py b/srdatasets/datasets/utils.py index cf6ad88..c431d19 100644 --- a/srdatasets/datasets/utils.py +++ b/srdatasets/datasets/utils.py @@ -44,11 +44,49 @@ def extract(filepath, out): elif filename.endswith(".tar.gz"): with tarfile.open(filepath, "r:gz") as tar: - tar.extractall(out) + 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(tar, out) elif filename.endswith(".tar.bz2"): with tarfile.open(filepath, "r:bz2") as tar: - tar.extractall(out) + 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(tar, out) elif filename.endswith(".gz"): with gzip.open(filepath, "rb") as fin: