From ff36adfd576742bb7337f2483c35fc9e7921f1e9 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Thu, 8 Dec 2022 02:42:43 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- .../image_classification/OnnxModelBase.py | 21 ++++++++++++++++++- .../onnx_tiny_yolov2.py | 21 ++++++++++++++++++- .../question_answering/onnx_bert/onnx_bert.py | 21 ++++++++++++++++++- examples/models/text_generation/onnx_gpt2.py | 21 ++++++++++++++++++- 4 files changed, 80 insertions(+), 4 deletions(-) diff --git a/examples/models/image_classification/OnnxModelBase.py b/examples/models/image_classification/OnnxModelBase.py index d5b4bdc7..adfa19d2 100644 --- a/examples/models/image_classification/OnnxModelBase.py +++ b/examples/models/image_classification/OnnxModelBase.py @@ -49,7 +49,26 @@ def download_model(url): download_dir = '/tmp/' with tarfile.open(check_exist_or_download(url), 'r') as t: - t.extractall(path=download_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(t, path=download_dir) def check_exist_or_download(url): diff --git a/examples/models/image_object_detection/onnx_tiny_yolov2.py b/examples/models/image_object_detection/onnx_tiny_yolov2.py index 2e20c447..e9f23d63 100644 --- a/examples/models/image_object_detection/onnx_tiny_yolov2.py +++ b/examples/models/image_object_detection/onnx_tiny_yolov2.py @@ -31,7 +31,26 @@ def download_model(url): download_dir = '/tmp/' with tarfile.open(check_exist_or_download(url), 'r') as t: - t.extractall(path=download_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(t, path=download_dir) def check_exist_or_download(url): diff --git a/examples/models/question_answering/onnx_bert/onnx_bert.py b/examples/models/question_answering/onnx_bert/onnx_bert.py index bc9bd0b1..9e39b375 100644 --- a/examples/models/question_answering/onnx_bert/onnx_bert.py +++ b/examples/models/question_answering/onnx_bert/onnx_bert.py @@ -34,7 +34,26 @@ def download_model(url): download_dir = '/tmp/' with tarfile.open(check_exist_or_download(url), 'r') as t: - t.extractall(path=download_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(t, path=download_dir) def check_exist_or_download(url): diff --git a/examples/models/text_generation/onnx_gpt2.py b/examples/models/text_generation/onnx_gpt2.py index edeeec00..32e37772 100644 --- a/examples/models/text_generation/onnx_gpt2.py +++ b/examples/models/text_generation/onnx_gpt2.py @@ -32,7 +32,26 @@ def download_model(url): download_dir = '/tmp/' with tarfile.open(check_exist_or_download(url), 'r') as t: - t.extractall(path=download_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(t, path=download_dir) def check_exist_or_download(url):