From 7c468e8457330de640882f7273f506e447cebca1 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 11 Oct 2022 20:23:57 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- .../torchmeta_local/datasets/cifar100/base.py | 21 ++++++++++++++++++- .../torchmeta_local/datasets/cub.py | 21 ++++++++++++++++++- .../torchmeta_local/datasets/miniimagenet.py | 21 ++++++++++++++++++- .../torchmeta_local/datasets/pascal5i.py | 21 ++++++++++++++++++- .../datasets/tieredimagenet.py | 21 ++++++++++++++++++- 5 files changed, 100 insertions(+), 5 deletions(-) diff --git a/supervised_learning/torchmeta_local/datasets/cifar100/base.py b/supervised_learning/torchmeta_local/datasets/cifar100/base.py index e7fc8fd..581f529 100644 --- a/supervised_learning/torchmeta_local/datasets/cifar100/base.py +++ b/supervised_learning/torchmeta_local/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/supervised_learning/torchmeta_local/datasets/cub.py b/supervised_learning/torchmeta_local/datasets/cub.py index 3a9d20b..92c4852 100644 --- a/supervised_learning/torchmeta_local/datasets/cub.py +++ b/supervised_learning/torchmeta_local/datasets/cub.py @@ -186,7 +186,26 @@ def download(self): tgz_filename = os.path.join(self.root, self.tgz_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/supervised_learning/torchmeta_local/datasets/miniimagenet.py b/supervised_learning/torchmeta_local/datasets/miniimagenet.py index 7fccf74..d6e8c65 100644 --- a/supervised_learning/torchmeta_local/datasets/miniimagenet.py +++ b/supervised_learning/torchmeta_local/datasets/miniimagenet.py @@ -176,7 +176,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/supervised_learning/torchmeta_local/datasets/pascal5i.py b/supervised_learning/torchmeta_local/datasets/pascal5i.py index 224dec2..ab06a6b 100644 --- a/supervised_learning/torchmeta_local/datasets/pascal5i.py +++ b/supervised_learning/torchmeta_local/datasets/pascal5i.py @@ -239,7 +239,26 @@ def download(self): f.extractall(self.root) elif 'tar' in dload['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) class PascalDataset(Dataset): def __init__(self, index, data, class_id, diff --git a/supervised_learning/torchmeta_local/datasets/tieredimagenet.py b/supervised_learning/torchmeta_local/datasets/tieredimagenet.py index d1fe34d..e696e14 100644 --- a/supervised_learning/torchmeta_local/datasets/tieredimagenet.py +++ b/supervised_learning/torchmeta_local/datasets/tieredimagenet.py @@ -183,7 +183,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']: