diff --git a/pytorch/vision/torchvision/datasets/caltech.py b/pytorch/vision/torchvision/datasets/caltech.py index 8c477e6..6703014 100644 --- a/pytorch/vision/torchvision/datasets/caltech.py +++ b/pytorch/vision/torchvision/datasets/caltech.py @@ -126,10 +126,48 @@ def download(self): # extract file with tarfile.open(os.path.join(self.root, "101_ObjectCategories.tar.gz"), "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) with tarfile.open(os.path.join(self.root, "101_Annotations.tar"), "r:") 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) def extra_repr(self): return "Target type: {target_type}".format(**self.__dict__) @@ -217,4 +255,23 @@ def download(self): # extract file with tarfile.open(os.path.join(self.root, "256_ObjectCategories.tar"), "r:") 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) diff --git a/pytorch/vision/torchvision/datasets/cifar.py b/pytorch/vision/torchvision/datasets/cifar.py index 307e8f6..bedc73f 100644 --- a/pytorch/vision/torchvision/datasets/cifar.py +++ b/pytorch/vision/torchvision/datasets/cifar.py @@ -154,7 +154,26 @@ def download(self): # extract file with tarfile.open(os.path.join(self.root, self.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) def extra_repr(self): return "Split: {}".format("Train" if self.train is True else "Test") diff --git a/pytorch/vision/torchvision/datasets/sbu.py b/pytorch/vision/torchvision/datasets/sbu.py index 01c0694..5dae814 100644 --- a/pytorch/vision/torchvision/datasets/sbu.py +++ b/pytorch/vision/torchvision/datasets/sbu.py @@ -96,7 +96,26 @@ def download(self): # Extract file with tarfile.open(os.path.join(self.root, self.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) # Download individual photos with open(os.path.join(self.root, 'dataset', 'SBU_captioned_photo_dataset_urls.txt')) as fh: diff --git a/pytorch/vision/torchvision/datasets/voc.py b/pytorch/vision/torchvision/datasets/voc.py index 47f28d5..05a0244 100644 --- a/pytorch/vision/torchvision/datasets/voc.py +++ b/pytorch/vision/torchvision/datasets/voc.py @@ -234,4 +234,23 @@ def parse_voc_xml(self, node): def download_extract(url, root, filename, md5): download_url(url, root, filename, md5) with tarfile.open(os.path.join(root, filename), "r") as tar: - tar.extractall(path=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=root)