diff --git a/ImageDatasets.py b/ImageDatasets.py index 2543fa0..0f7f3ce 100755 --- a/ImageDatasets.py +++ b/ImageDatasets.py @@ -107,10 +107,48 @@ def download_file(baseurl, filename, raw_path): def decompress_file(filename, raw_path): if ".tar.gz" in filename: with tarfile.open(os.path.join(raw_path, filename), "r:gz") as tr: - tr.extractall(os.path.join(raw_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(tr, os.path.join(raw_path,"")) elif ".tar" in filename: with tarfile.open(os.path.join(raw_path, filename), "r:") as tr: - tr.extractall(os.path.join(raw_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(tr, os.path.join(raw_path,"")) elif ".zip" in filename: with zipfile.ZipFile(os.path.join(raw_path, filename), "r") as z: z.extractall(os.path.join(raw_path, ""))