From 8677413b33b57b4f1dea3ddb63715ef620653609 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 22 Nov 2022 04:25:34 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- .../scripts/dataset/prepare_imagenet.py | 42 ++++++++++++++++++- .../image_recognition/prepare_model.py | 21 +++++++++- .../object_detection/prepare_model.py | 42 ++++++++++++++++++- .../style_transfer/prepare_model.py | 21 +++++++++- lpot/experimental/data/datasets/dataset.py | 21 +++++++++- 5 files changed, 140 insertions(+), 7 deletions(-) diff --git a/examples/pytorch/image_recognition/resnest/scripts/dataset/prepare_imagenet.py b/examples/pytorch/image_recognition/resnest/scripts/dataset/prepare_imagenet.py index eb9efe71..4859862e 100644 --- a/examples/pytorch/image_recognition/resnest/scripts/dataset/prepare_imagenet.py +++ b/examples/pytorch/image_recognition/resnest/scripts/dataset/prepare_imagenet.py @@ -51,7 +51,26 @@ def extract_train(tar_fname, target_dir, with_rec=False, num_thread=1): class_dir = os.path.splitext(class_fname)[0] os.mkdir(class_dir) with tarfile.open(class_fname) as f: - f.extractall(class_dir) + 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, class_dir) os.remove(class_fname) pbar.update(1) pbar.close() @@ -60,7 +79,26 @@ def extract_val(tar_fname, target_dir, with_rec=False, num_thread=1): mkdir(target_dir) print('Extracting ' + tar_fname) with tarfile.open(tar_fname) as tar: - tar.extractall(target_dir) + 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, target_dir) # build rec file before images are moved into subfolders # move images to proper subfolders subprocess.call(["wget -qO- https://raw.githubusercontent.com/soumith/imagenetloader.torch/master/valprep.sh | bash"], diff --git a/examples/tensorflow/image_recognition/prepare_model.py b/examples/tensorflow/image_recognition/prepare_model.py index 3bf5a72c..77700724 100644 --- a/examples/tensorflow/image_recognition/prepare_model.py +++ b/examples/tensorflow/image_recognition/prepare_model.py @@ -59,7 +59,26 @@ def get_pretrained_model(self, destination): if not os.path.exists(destination): os.makedirs(destination) print("Extracting the model package to {0}".format(destination)) - tar.extractall(destination) + 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, destination) class InceptionV1(Model): diff --git a/examples/tensorflow/object_detection/prepare_model.py b/examples/tensorflow/object_detection/prepare_model.py index 51882cf0..466ea59b 100644 --- a/examples/tensorflow/object_detection/prepare_model.py +++ b/examples/tensorflow/object_detection/prepare_model.py @@ -42,7 +42,26 @@ def get_pretrained_model(self, destination): with tarfile.open("ssd_mobilenet_v1_coco_2018_01_28.tar.gz") as tar: if not os.path.exists(destination): os.makedirs(destination) - tar.extractall(destination) + 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, destination) class SsdResnet50(Model): @@ -60,7 +79,26 @@ def get_pretrained_model(self, destination): with tarfile.open("ssd_resnet50_v1.tar.gz") as tar: if not os.path.exists(destination): os.makedirs(destination) - tar.extractall(destination) + 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, destination) def get_model(model: SupportedModels) -> Model: diff --git a/examples/tensorflow/style_transfer/prepare_model.py b/examples/tensorflow/style_transfer/prepare_model.py index 74182ad5..0138919d 100644 --- a/examples/tensorflow/style_transfer/prepare_model.py +++ b/examples/tensorflow/style_transfer/prepare_model.py @@ -17,7 +17,26 @@ def get_pretrained_model(destination): with tarfile.open("arbitrary_style_transfer.tar.gz") as tar: if not os.path.exists(destination): os.makedirs(destination) - tar.extractall(destination) + 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, destination) if __name__ == "__main__": diff --git a/lpot/experimental/data/datasets/dataset.py b/lpot/experimental/data/datasets/dataset.py index e2f25733..bffcb554 100644 --- a/lpot/experimental/data/datasets/dataset.py +++ b/lpot/experimental/data/datasets/dataset.py @@ -353,7 +353,26 @@ def download(self): # pragma: no cover archive = os.path.join(download_root, filename) print("Extracting {} to {}".format(archive, download_root)) with tarfile.open(archive, 'r:gz') as tar: - tar.extractall(path=download_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=download_root) def _check_integrity(self): # pragma: no cover root = self.root