From aa19bd832dd3cc79485897a1f3bf11efbe8384c7 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Thu, 15 Dec 2022 04:57:45 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- torchmeta/datasets/cifar100/base.py | 21 ++++++++++++++++++++- torchmeta/datasets/cub.py | 21 ++++++++++++++++++++- torchmeta/datasets/miniimagenet.py | 21 ++++++++++++++++++++- torchmeta/datasets/tieredimagenet.py | 21 ++++++++++++++++++++- 4 files changed, 80 insertions(+), 4 deletions(-) diff --git a/torchmeta/datasets/cifar100/base.py b/torchmeta/datasets/cifar100/base.py index 5f0300b..e92a64c 100644 --- a/torchmeta/datasets/cifar100/base.py +++ b/torchmeta/datasets/cifar100/base.py @@ -99,7 +99,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 1c57c7a..e249d23 100644 --- a/torchmeta/datasets/cub.py +++ b/torchmeta/datasets/cub.py @@ -182,7 +182,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 f3e3c54..1a8b41c 100644 --- a/torchmeta/datasets/miniimagenet.py +++ b/torchmeta/datasets/miniimagenet.py @@ -174,7 +174,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 84d7b4e..93aa18f 100644 --- a/torchmeta/datasets/tieredimagenet.py +++ b/torchmeta/datasets/tieredimagenet.py @@ -181,7 +181,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']: