diff --git a/torchmeta/datasets/cifar100/base.py b/torchmeta/datasets/cifar100/base.py index c28a880a..fcdc6653 100644 --- a/torchmeta/datasets/cifar100/base.py +++ b/torchmeta/datasets/cifar100/base.py @@ -100,7 +100,26 @@ def download(self): download_url(self.download_url, self.root, filename=gz_filename, md5=self.gz_md5) with tarfile.open(os.path.join(self.root, gz_filename), 'r:gz') as tar: - tar.extractall(path=self.root) + 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, path=self.root) train_filename = os.path.join(self.root, self.gz_folder, 'train') check_integrity(train_filename, self.files_md5['train']) diff --git a/torchmeta/datasets/cub.py b/torchmeta/datasets/cub.py index ae16f3c7..e710500b 100644 --- a/torchmeta/datasets/cub.py +++ b/torchmeta/datasets/cub.py @@ -183,7 +183,26 @@ def download(self): tgz_filename = os.path.join(self.root, filename) with tarfile.open(tgz_filename, 'r') as f: - f.extractall(self.root) + 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(f, self.root) image_folder = os.path.join(self.root, self.image_folder) for split in ['train', 'val', 'test']: diff --git a/torchmeta/datasets/miniimagenet.py b/torchmeta/datasets/miniimagenet.py index 1667eaf8..9f78bd53 100644 --- a/torchmeta/datasets/miniimagenet.py +++ b/torchmeta/datasets/miniimagenet.py @@ -175,7 +175,26 @@ def download(self): filename = os.path.join(self.root, self.gz_filename) with tarfile.open(filename, 'r') as f: - f.extractall(self.root) + 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(f, self.root) for split in ['train', 'val', 'test']: filename = os.path.join(self.root, self.filename.format(split)) diff --git a/torchmeta/datasets/tieredimagenet.py b/torchmeta/datasets/tieredimagenet.py index de441f96..2ef80311 100644 --- a/torchmeta/datasets/tieredimagenet.py +++ b/torchmeta/datasets/tieredimagenet.py @@ -182,7 +182,26 @@ def download(self): filename = os.path.join(self.root, self.tar_filename) with tarfile.open(filename, 'r') as f: - f.extractall(self.root) + 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(f, self.root) tar_folder = os.path.join(self.root, self.tar_folder) for split in ['train', 'val', 'test']: