diff --git a/cifar100_utils.py b/cifar100_utils.py index 5bb71a6..b72f858 100644 --- a/cifar100_utils.py +++ b/cifar100_utils.py @@ -33,7 +33,29 @@ def download(dataset_folder_path): if not isdir(dataset_folder_path): with tarfile.open('cifar-100-python.tar.gz') as tar: - tar.extractall() + + import os + + 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) tar.close() else: print('cifar10 dataset already exists') diff --git a/cifar10_utils.py b/cifar10_utils.py index 1e2ae05..df109ee 100644 --- a/cifar10_utils.py +++ b/cifar10_utils.py @@ -30,7 +30,29 @@ def download(dataset_folder_path): if not isdir(dataset_folder_path): with tarfile.open('cifar-10-python.tar.gz') as tar: - tar.extractall() + + import os + + 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) tar.close() else: print('cifar10 dataset already exists')