From b8abbe401c7080fa93eecf548a4e97f76fdabab7 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 11 Oct 2022 18:04:00 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- .../template_project/microtvm_api_server.py | 21 ++++++++++++++++++- .../template_project/microtvm_api_server.py | 21 ++++++++++++++++++- .../template_project/microtvm_api_server.py | 21 ++++++++++++++++++- .../template_project/microtvm_api_server.py | 21 ++++++++++++++++++- .../template_project/microtvm_api_server.py | 21 ++++++++++++++++++- .../template_project/microtvm_api_server.py | 21 ++++++++++++++++++- .../template_project/microtvm_api_server.py | 21 ++++++++++++++++++- .../template_project/microtvm_api_server.py | 21 ++++++++++++++++++- 8 files changed, 160 insertions(+), 8 deletions(-) diff --git a/lambda-optimize/arm_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py b/lambda-optimize/arm_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py index 1768c61..26330c1 100644 --- a/lambda-optimize/arm_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py +++ b/lambda-optimize/arm_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py @@ -168,7 +168,26 @@ def _disassemble_mlf(self, mlf_tar_path, source_dir): with tempfile.TemporaryDirectory() as mlf_unpacking_dir_str: mlf_unpacking_dir = pathlib.Path(mlf_unpacking_dir_str) with tarfile.open(mlf_tar_path, "r:") as tar: - tar.extractall(mlf_unpacking_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, mlf_unpacking_dir) model_dir = source_dir / "model" model_dir.mkdir() diff --git a/lambda-optimize/arm_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py b/lambda-optimize/arm_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py index 7e13f92..868ae3a 100644 --- a/lambda-optimize/arm_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py +++ b/lambda-optimize/arm_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py @@ -444,7 +444,26 @@ def generate_project(self, model_library_format_path, standalone_crt_dir, projec # Populate extra_files if options.get("extra_files_tar"): with tarfile.open(options["extra_files_tar"], mode="r:*") as tf: - tf.extractall(project_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(tf, project_dir) def build(self, options): BUILD_DIR.mkdir() diff --git a/lambda-optimize/intel_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py b/lambda-optimize/intel_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py index 1768c61..26330c1 100644 --- a/lambda-optimize/intel_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py +++ b/lambda-optimize/intel_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py @@ -168,7 +168,26 @@ def _disassemble_mlf(self, mlf_tar_path, source_dir): with tempfile.TemporaryDirectory() as mlf_unpacking_dir_str: mlf_unpacking_dir = pathlib.Path(mlf_unpacking_dir_str) with tarfile.open(mlf_tar_path, "r:") as tar: - tar.extractall(mlf_unpacking_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, mlf_unpacking_dir) model_dir = source_dir / "model" model_dir.mkdir() diff --git a/lambda-optimize/intel_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py b/lambda-optimize/intel_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py index 7e13f92..868ae3a 100644 --- a/lambda-optimize/intel_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py +++ b/lambda-optimize/intel_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py @@ -444,7 +444,26 @@ def generate_project(self, model_library_format_path, standalone_crt_dir, projec # Populate extra_files if options.get("extra_files_tar"): with tarfile.open(options["extra_files_tar"], mode="r:*") as tf: - tf.extractall(project_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(tf, project_dir) def build(self, options): BUILD_DIR.mkdir() diff --git a/lambda-serving/arm_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py b/lambda-serving/arm_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py index 1768c61..26330c1 100644 --- a/lambda-serving/arm_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py +++ b/lambda-serving/arm_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py @@ -168,7 +168,26 @@ def _disassemble_mlf(self, mlf_tar_path, source_dir): with tempfile.TemporaryDirectory() as mlf_unpacking_dir_str: mlf_unpacking_dir = pathlib.Path(mlf_unpacking_dir_str) with tarfile.open(mlf_tar_path, "r:") as tar: - tar.extractall(mlf_unpacking_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, mlf_unpacking_dir) model_dir = source_dir / "model" model_dir.mkdir() diff --git a/lambda-serving/arm_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py b/lambda-serving/arm_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py index 7e13f92..868ae3a 100644 --- a/lambda-serving/arm_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py +++ b/lambda-serving/arm_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py @@ -444,7 +444,26 @@ def generate_project(self, model_library_format_path, standalone_crt_dir, projec # Populate extra_files if options.get("extra_files_tar"): with tarfile.open(options["extra_files_tar"], mode="r:*") as tf: - tf.extractall(project_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(tf, project_dir) def build(self, options): BUILD_DIR.mkdir() diff --git a/lambda-serving/intel_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py b/lambda-serving/intel_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py index 1768c61..26330c1 100644 --- a/lambda-serving/intel_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py +++ b/lambda-serving/intel_tvm/tvm/apps/microtvm/arduino/template_project/microtvm_api_server.py @@ -168,7 +168,26 @@ def _disassemble_mlf(self, mlf_tar_path, source_dir): with tempfile.TemporaryDirectory() as mlf_unpacking_dir_str: mlf_unpacking_dir = pathlib.Path(mlf_unpacking_dir_str) with tarfile.open(mlf_tar_path, "r:") as tar: - tar.extractall(mlf_unpacking_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, mlf_unpacking_dir) model_dir = source_dir / "model" model_dir.mkdir() diff --git a/lambda-serving/intel_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py b/lambda-serving/intel_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py index 7e13f92..868ae3a 100644 --- a/lambda-serving/intel_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py +++ b/lambda-serving/intel_tvm/tvm/apps/microtvm/zephyr/template_project/microtvm_api_server.py @@ -444,7 +444,26 @@ def generate_project(self, model_library_format_path, standalone_crt_dir, projec # Populate extra_files if options.get("extra_files_tar"): with tarfile.open(options["extra_files_tar"], mode="r:*") as tf: - tf.extractall(project_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(tf, project_dir) def build(self, options): BUILD_DIR.mkdir()